You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2010/04/26 11:43:02 UTC

svn commit: r937984 - /camel/trunk/examples/camel-example-guice-jms/src/main/java/org/apache/camel/example/guice/jms/OSGiCamelContextProvider.java

Author: ningjiang
Date: Mon Apr 26 09:43:02 2010
New Revision: 937984

URL: http://svn.apache.org/viewvc?rev=937984&view=rev
Log:
CAMEL-2675 fixed the GuiceTest

Modified:
    camel/trunk/examples/camel-example-guice-jms/src/main/java/org/apache/camel/example/guice/jms/OSGiCamelContextProvider.java

Modified: camel/trunk/examples/camel-example-guice-jms/src/main/java/org/apache/camel/example/guice/jms/OSGiCamelContextProvider.java
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-guice-jms/src/main/java/org/apache/camel/example/guice/jms/OSGiCamelContextProvider.java?rev=937984&r1=937983&r2=937984&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-guice-jms/src/main/java/org/apache/camel/example/guice/jms/OSGiCamelContextProvider.java (original)
+++ camel/trunk/examples/camel-example-guice-jms/src/main/java/org/apache/camel/example/guice/jms/OSGiCamelContextProvider.java Mon Apr 26 09:43:02 2010
@@ -43,8 +43,13 @@ public class OSGiCamelContextProvider im
     private Injector injector;
     
     public OSGiCamelContextProvider(BundleContext context) {
-        factory = new CamelContextFactory();
-        factory.setBundleContext(context);
+        // In this we can support to run this provider with or without OSGI
+        if (context != null) {
+            factory = new CamelContextFactory();
+            factory.setBundleContext(context);
+        } else {
+            factory = null;
+        }
     }
     
     protected Context getJndiContext() {
@@ -66,7 +71,12 @@ public class OSGiCamelContextProvider im
     }
 
     public CamelContext get() {
-        DefaultCamelContext camelContext = factory.createContext();
+        DefaultCamelContext camelContext;
+        if (factory != null) {
+            camelContext = factory.createContext();
+        } else {
+            camelContext = new DefaultCamelContext();
+        }
         if (routeBuilders != null) {
             for (RoutesBuilder builder : routeBuilders) {
                 try {