[jboss-svn-commits] JBL Code SVN: r31635 - labs/jbossrules/trunk/drools-api/src/main/java/org/drools/util.

[jboss-svn-commits at lists.jboss.org]

Author: mark.proctor at jboss.com
Date: 2010-02-12 14:13:32 -0500 (Fri, 12 Feb 2010)
New Revision: 31635

Modified:
   labs/jbossrules/trunk/drools-api/src/main/java/org/drools/util/ClassLoaderUtil.java
Log:
JBRULES-2351 OSGi Ready
-Reverting classloader order, as OSGi no longer seems to be failing

Modified: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/util/ClassLoaderUtil.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/util/ClassLoaderUtil.java	2010-02-12 18:53:52 UTC (rev 31634)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/util/ClassLoaderUtil.java	2010-02-12 19:13:32 UTC (rev 31635)
@@ -11,19 +11,18 @@
         ClassLoader currentClassLoader = ( cls != null ) ? cls.getClassLoader() : ClassLoaderUtil.class.getClassLoader();
         ClassLoader systemClassLoader = Class.class.getClassLoader().getSystemClassLoader();
         
-        CompositeClassLoader cl = new CompositeClassLoader( null );
+        CompositeClassLoader cl = new CompositeClassLoader( null );        
         
-        if (currentClassLoader != null ) {
-            // this must come first, so that generated classes use the same classloader for search and execution
-            // as the main drools jars (core and compiler)
-            cl.addClassLoader(currentClassLoader); 
-        } 
-        
         if (classLoader != null ) {
             // the user specified classloader
         	cl.addClassLoader(classLoader); 
         }
         
+        if (currentClassLoader != null ) {
+            // the current classloader, typically from a drools-core or drools-compiler class
+            cl.addClassLoader(currentClassLoader); 
+        }         
+        
         if (contextClassLoader != null ) {
             // context classloader
         	cl.addClassLoader(contextClassLoader);