Author: davsclaus
Date: Sun Dec 19 09:17:02 2010
New Revision: 1050776

URL: http://svn.apache.org/viewvc?rev=1050776&view=rev
Log:
CAMEL-3442: Fixed package scan class loading issue in Apache ServiceMix 4.x 
when using JBI, due OSGi concurrent nature causing concurrent access to class 
loaders.

Modified:
    
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultPackageScanClassResolver.java
    
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/PackageScanClassResolver.java
    
camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiPackageScanClassResolver.java

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultPackageScanClassResolver.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultPackageScanClassResolver.java?rev=1050776&r1=1050775&r2=1050776&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultPackageScanClassResolver.java
 (original)
+++ 
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultPackageScanClassResolver.java
 Sun Dec 19 09:17:02 2010
@@ -29,7 +29,6 @@ import java.net.URLDecoder;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Enumeration;
-import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.Set;
 import java.util.jar.JarEntry;
@@ -51,17 +50,29 @@ import org.apache.commons.logging.LogFac
 public class DefaultPackageScanClassResolver implements 
PackageScanClassResolver {
 
     protected final transient Log log = LogFactory.getLog(getClass());
-    private Set<ClassLoader> classLoaders;
+    private final Set<ClassLoader> classLoaders = new 
LinkedHashSet<ClassLoader>();
     private Set<PackageScanFilter> scanFilters;
     private String[] acceptableSchemes = {};
 
-    public void addClassLoader(ClassLoader classLoader) {
+    public DefaultPackageScanClassResolver() {
         try {
-            getClassLoaders().add(classLoader);
+            ClassLoader ccl = Thread.currentThread().getContextClassLoader();
+            if (ccl != null) {
+                if (log.isTraceEnabled()) {
+                    log.trace("The thread context class loader: " + ccl + "  
is used to load the class");
+                }
+                classLoaders.add(ccl);
+            }
         } catch (UnsupportedOperationException ex) {
-            // Ignore this exception as the PackageScanClassResolver 
+            // Ignore this exception as the PackageScanClassResolver
             // don't want use any other classloader
         }
+
+        
classLoaders.add(DefaultPackageScanClassResolver.class.getClassLoader());
+    }
+
+    public void addClassLoader(ClassLoader classLoader) {
+        classLoaders.add(classLoader);
     }
 
     public void addFilter(PackageScanFilter filter) {
@@ -95,22 +106,13 @@ public class DefaultPackageScanClassReso
     }
 
     public Set<ClassLoader> getClassLoaders() {
-        if (classLoaders == null) {
-            classLoaders = new HashSet<ClassLoader>();
-            ClassLoader ccl = Thread.currentThread().getContextClassLoader();
-            if (ccl != null) {
-                if (log.isTraceEnabled()) {
-                    log.trace("The thread context class loader: " + ccl + "  
is used to load the class");
-                }
-                classLoaders.add(ccl);
-            }
-            
classLoaders.add(DefaultPackageScanClassResolver.class.getClassLoader());
-        }
-        return classLoaders;
+        // return a new set to avoid any concurrency issues in other runtimes 
such as OSGi
+        return Collections.unmodifiableSet(new 
LinkedHashSet<ClassLoader>(classLoaders));
     }
 
     public void setClassLoaders(Set<ClassLoader> classLoaders) {
-        this.classLoaders = classLoaders;
+        // add all the class loaders
+        this.classLoaders.addAll(classLoaders);
     }
 
     @SuppressWarnings("unchecked")

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/PackageScanClassResolver.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/PackageScanClassResolver.java?rev=1050776&r1=1050775&r2=1050776&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/PackageScanClassResolver.java
 (original)
+++ 
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/PackageScanClassResolver.java
 Sun Dec 19 09:17:02 2010
@@ -29,11 +29,17 @@ public interface PackageScanClassResolve
      * classes. If none is set then the context classloader will be used.
      *
      * @param classLoaders loaders to use when scanning for classes
+     * @deprecated use {...@link #addClassLoader(ClassLoader)} instead.
      */
+    @Deprecated
     void setClassLoaders(Set<ClassLoader> classLoaders);
 
     /**
      * Gets the ClassLoader instances that should be used when scanning for 
classes.
+     * <p/>
+     * This implementation will return a new unmodifiable set containing the 
classloaders.
+     * Use the {...@link #addClassLoader(ClassLoader)} method if you want to 
add new classloaders
+     * to the class loaders list.
      *
      * @return the class loaders to use
      */

Modified: 
camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiPackageScanClassResolver.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiPackageScanClassResolver.java?rev=1050776&r1=1050775&r2=1050776&view=diff
==============================================================================
--- 
camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiPackageScanClassResolver.java
 (original)
+++ 
camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiPackageScanClassResolver.java
 Sun Dec 19 09:17:02 2010
@@ -32,33 +32,31 @@ import org.osgi.framework.BundleContext;
 public class OsgiPackageScanClassResolver extends 
DefaultPackageScanClassResolver {
 
     private final Bundle bundle;
-    
-    public OsgiPackageScanClassResolver(Bundle bundle) {
-        this.bundle = bundle;
-    }
 
     public OsgiPackageScanClassResolver(BundleContext context) {
-        bundle = context.getBundle();
+        this(context.getBundle());
     }
 
-    public Set<ClassLoader> getClassLoaders() {
-        // Added the BundleDelegatingClassLoader to load the class
-        Set<ClassLoader> classLoaders = super.getClassLoaders();
-        ClassLoader osgiLoader = new BundleDelegatingClassLoader(bundle);
-        classLoaders.add(osgiLoader);
-        return classLoaders;
+    public OsgiPackageScanClassResolver(Bundle bundle) {
+        super();
+        this.bundle = bundle;
+        // add the BundleDelegatingClassLoader to the class loaders
+        addClassLoader(new BundleDelegatingClassLoader(bundle));
     }
-    
+
     public void find(PackageScanFilter test, String packageName, Set<Class<?>> 
classes) {
         packageName = packageName.replace('.', '/');
-        int classesSize = classes.size(); 
+        // remember the number of classes found so far
+        int classesSize = classes.size();
+        // look in osgi bundles
         loadImplementationsInBundle(test, packageName, classes);
+        // if we did not find any new, then fallback to use regular non bundle 
class loading
         if (classes.size() == classesSize) {
             // Using the non-OSGi classloaders as a fallback
             // this is necessary when use JBI packaging for servicemix-camel SU
             // so that we get chance to use SU classloader to scan packages in 
the SU
             if (log.isTraceEnabled()) {
-                log.trace("Using only regular classloaders");
+                log.trace("Cannot find any classes in bundles, not trying 
regular classloaders scanning: " + packageName);
             }
             for (ClassLoader classLoader : super.getClassLoaders()) {
                 if (!isOsgiClassloader(classLoader)) {
@@ -117,7 +115,8 @@ public class OsgiPackageScanClassResolve
             }
             return urls;
         } catch (Throwable t) {
-            log.error("Could not search osgi bundles for classes matching 
criteria: " + test + "due to an Exception: " + t.getMessage());
+            log.warn("Cannot search bundles for classes matching criteria: " + 
test + " due: "
+                    + t.getMessage() + ". This exception will be ignored.", t);
             return null;
         }
     }


Reply via email to