You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2015/08/05 15:01:18 UTC
[3/4] camel git commit: CAMEL-8857: Fixed CS
CAMEL-8857: Fixed CS
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/18859fb0
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/18859fb0
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/18859fb0
Branch: refs/heads/camel-2.15.x
Commit: 18859fb053fd2565c4f619122039991df8926eb1
Parents: bfd8a10
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Aug 5 15:08:17 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Aug 5 15:08:17 2015 +0200
----------------------------------------------------------------------
.../main/java/org/apache/camel/scr/AbstractCamelRunner.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/18859fb0/components/camel-scr/src/main/java/org/apache/camel/scr/AbstractCamelRunner.java
----------------------------------------------------------------------
diff --git a/components/camel-scr/src/main/java/org/apache/camel/scr/AbstractCamelRunner.java b/components/camel-scr/src/main/java/org/apache/camel/scr/AbstractCamelRunner.java
index 86ff9bb..892c885 100644
--- a/components/camel-scr/src/main/java/org/apache/camel/scr/AbstractCamelRunner.java
+++ b/components/camel-scr/src/main/java/org/apache/camel/scr/AbstractCamelRunner.java
@@ -42,7 +42,6 @@ import org.apache.camel.core.osgi.utils.BundleDelegatingClassLoader;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.impl.ExplicitCamelContextNameStrategy;
import org.apache.camel.impl.SimpleRegistry;
-import org.apache.camel.model.ModelCamelContext;
import org.apache.camel.util.ReflectionHelper;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
@@ -55,14 +54,14 @@ public abstract class AbstractCamelRunner implements Runnable {
public static final String PROPERTY_PREFIX = "camel.scr.properties.prefix";
protected Logger log = LoggerFactory.getLogger(getClass());
- protected ModelCamelContext context;
+ protected CamelContext context;
protected SimpleRegistry registry = new SimpleRegistry();
+ protected boolean active;
private ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor();
private ScheduledFuture starter;
private volatile boolean activated;
private volatile boolean started;
- protected volatile boolean active;
public synchronized void activate(final BundleContext bundleContext, final Map<String, String> props) throws Exception {
if (activated) {
@@ -214,7 +213,7 @@ public abstract class AbstractCamelRunner implements Runnable {
}
}
- public ModelCamelContext getContext() {
+ public CamelContext getContext() {
return context;
}