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-8857: Polished
Date Wed, 05 Aug 2015 12:15:53 GMT
Repository: camel
Updated Branches:
  refs/heads/master 01c0963d4 -> c1b33e990


CAMEL-8857: Polished


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

Branch: refs/heads/master
Commit: c1b33e990ae5da7ca1e0268e79acc728393fd3ae
Parents: 01c0963
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Wed Aug 5 14:21:22 2015 +0200
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Wed Aug 5 14:21:22 2015 +0200

----------------------------------------------------------------------
 components/camel-scr/pom.xml                                      | 3 +--
 .../src/main/java/org/apache/camel/scr/AbstractCamelRunner.java   | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/c1b33e99/components/camel-scr/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-scr/pom.xml b/components/camel-scr/pom.xml
index 6987ba6..64e0b77 100644
--- a/components/camel-scr/pom.xml
+++ b/components/camel-scr/pom.xml
@@ -30,8 +30,7 @@
   <packaging>bundle</packaging>
 
   <properties>
-    <camel.osgi.export.pkg>org.apache.camel.scr.*</camel.osgi.export.pkg>
-    <camel.osgi.import.camel.version>version="[2.12,$(version;=+;${camel.osgi.version.clean}))"</camel.osgi.import.camel.version>
+    <camel.osgi.export.pkg>org.apache.camel.scr</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>

http://git-wip-us.apache.org/repos/asf/camel/blob/c1b33e99/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 0d52927..fbd9431 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
@@ -90,7 +90,7 @@ public abstract class AbstractCamelRunner implements Runnable {
     }
 
     protected void createCamelContext(final BundleContext bundleContext, final Map<String,
String> props) {
-        if (null != bundleContext) {
+        if (bundleContext != null) {
             context = new OsgiDefaultCamelContext(bundleContext, registry);
             // Setup the application context classloader with the bundle classloader
             context.setApplicationContextClassLoader(new BundleDelegatingClassLoader(bundleContext.getBundle()));


Mime
View raw message