camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject camel git commit: CAMEL-8185: Changed parameter of scr reference event methods from service interface to service reference to handle multiple service versions
Date Fri, 02 Jan 2015 07:29:57 GMT
Repository: camel
Updated Branches:
  refs/heads/master 1d5ba0570 -> 7e7c659f0


CAMEL-8185: Changed parameter of scr reference event methods from service interface to service
reference to handle multiple service versions


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7e7c659f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7e7c659f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7e7c659f

Branch: refs/heads/master
Commit: 7e7c659f006b1e6c364ef46b437e24788da3af48
Parents: 1d5ba05
Author: Andrew Block <andy.block@gmail.com>
Authored: Thu Jan 1 20:29:59 2015 -0600
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Fri Jan 2 08:28:54 2015 +0100

----------------------------------------------------------------------
 .../main/java/org/apache/camel/scr/AbstractCamelRunner.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/7e7c659f/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 2e60d59..e341952 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,9 +42,9 @@ 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.spi.ComponentResolver;
 import org.apache.camel.util.ReflectionHelper;
 import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -221,12 +221,12 @@ public abstract class AbstractCamelRunner implements Runnable {
         return context;
     }
 
-    protected void gotCamelComponent(final ComponentResolver componentResolver) {
+    protected void gotCamelComponent(final ServiceReference serviceReference) {
         log.trace("Got a new Camel Component.");
         runWithDelay(this);
     }
 
-    protected void lostCamelComponent(final ComponentResolver componentResolver) {
+    protected void lostCamelComponent(final ServiceReference serviceReference) {
         log.trace("Lost a Camel Component.");
     }
 


Mime
View raw message