svn commit: r661676 - /activemq/camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/OsgiComponentResolver.java

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r661676 - /activemq/camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/OsgiComponentResolver.java

ningjiang
Author: ningjiang
Date: Fri May 30 05:12:46 2008
New Revision: 661676

URL: http://svn.apache.org/viewvc?rev=661676&view=rev
Log:
CAMEL-563 fixed the cxf name conflict in the osgi spring context

Modified:
    activemq/camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/OsgiComponentResolver.java

Modified: activemq/camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/OsgiComponentResolver.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/OsgiComponentResolver.java?rev=661676&r1=661675&r2=661676&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/OsgiComponentResolver.java (original)
+++ activemq/camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/OsgiComponentResolver.java Fri May 30 05:12:46 2008
@@ -163,10 +163,8 @@
         if (bean != null) {
             if (bean instanceof Component) {
                 return (Component)bean;
-            } else {
-                throw new IllegalArgumentException("Bean with name: " + name
-                                                   + " in registry is not a Component: " + bean);
             }
+            // we do not throw the exception here and try to auto create a component
         }
         // Check in OSGi bundles
         init();