[jboss-svn-commits] JBL Code SVN: r34285 - in labs/jbossrules/trunk: drools-core/META-INF and 1 other directories.

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

Author: mark.proctor at jboss.com
Date: 2010-07-29 04:40:50 -0400 (Thu, 29 Jul 2010)
New Revision: 34285

Modified:
   labs/jbossrules/trunk/drools-compiler/META-INF/MANIFEST.MF
   labs/jbossrules/trunk/drools-core/META-INF/MANIFEST.MF
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/RuleBaseConfiguration.java
Log:
JBRULES-2351 OSGi ready
-minor mistake, not passing the user provided classloader


Modified: labs/jbossrules/trunk/drools-compiler/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/drools-compiler/META-INF/MANIFEST.MF	2010-07-29 08:22:57 UTC (rev 34284)
+++ labs/jbossrules/trunk/drools-compiler/META-INF/MANIFEST.MF	2010-07-29 08:40:50 UTC (rev 34285)
@@ -18,7 +18,7 @@
  ersion="2.0",org.mvel2.templates;version="2.0",org.mvel2.util;version
  ="2.0",org.osgi.framework;version="1.5",org.osgi.util.tracker;version
  ="1.4",org.w3c.dom,org.xml.sax
-Bnd-LastModified: 1280379241857
+Bnd-LastModified: 1280391691618
 Export-Package: org.drools.lang.descr;version="5.1.0.SNAPSHOT",org.dro
  ols.builder.impl;uses:="org.drools.compiler,com.sun.tools.xjc";versio
  n="5.1.0.SNAPSHOT",org.drools.rule.builder;uses:="org.drools.lang.des

Modified: labs/jbossrules/trunk/drools-core/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/drools-core/META-INF/MANIFEST.MF	2010-07-29 08:22:57 UTC (rev 34284)
+++ labs/jbossrules/trunk/drools-core/META-INF/MANIFEST.MF	2010-07-29 08:40:50 UTC (rev 34285)
@@ -18,7 +18,7 @@
  g.mvel2.util;version="2.0",org.osgi.framework;version="1.5",org.osgi.
  util.tracker;version="1.4",org.w3c.dom,org.xml.sax,org.xml.sax.helper
  s
-Bnd-LastModified: 1280379205494
+Bnd-LastModified: 1280391657922
 Export-Package: org.drools.reteoo.builder;uses:="org.drools.rule,org.d
  rools.spi,org.drools.reteoo,org.drools.common,org.drools.time,org.dro
  ols,org.drools.base.accumulators,org.drools.base,org.drools.time.impl

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/RuleBaseConfiguration.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/RuleBaseConfiguration.java	2010-07-29 08:22:57 UTC (rev 34284)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/RuleBaseConfiguration.java	2010-07-29 08:40:50 UTC (rev 34285)
@@ -301,7 +301,7 @@
         } else if ( name.equals( "drools.ruleBaseUpdateHandler" ) ) {
             setRuleBaseUpdateHandler( StringUtils.isEmpty( value ) ? "" : value );
         } else if ( name.equals( "drools.conflictResolver" ) ) {
-            setConflictResolver( RuleBaseConfiguration.determineConflictResolver( StringUtils.isEmpty( value ) ? DepthConflictResolver.class.getName() : value ) );
+            setConflictResolver( determineConflictResolver( StringUtils.isEmpty( value ) ? DepthConflictResolver.class.getName() : value ) );
         } else if ( name.equals( "drools.advancedProcessRuleIntegration" ) ) {
             setAdvancedProcessRuleIntegration( StringUtils.isEmpty( value ) ? false : Boolean.valueOf( value ) );
         } else if ( name.equals( MultithreadEvaluationOption.PROPERTY_NAME ) ) {
@@ -383,7 +383,7 @@
     public RuleBaseConfiguration(Properties properties,
                                  ClassLoader... classLoaders) {
         init( properties,
-              classLoader );
+              classLoaders );
     }
 
     private void init(Properties properties,
@@ -443,8 +443,8 @@
         setRuleBaseUpdateHandler( this.chainedProperties.getProperty( "drools.ruleBaseUpdateHandler",
                                                                       "" ) );
 
-        setConflictResolver( RuleBaseConfiguration.determineConflictResolver( this.chainedProperties.getProperty( "drools.conflictResolver",
-                                                                                                                  "org.drools.conflict.DepthConflictResolver" ) ) );
+        setConflictResolver( determineConflictResolver( this.chainedProperties.getProperty( "drools.conflictResolver",
+                                                        "org.drools.conflict.DepthConflictResolver" ) ) );
 
         setAdvancedProcessRuleIntegration( Boolean.valueOf( this.chainedProperties.getProperty( "drools.advancedProcessRuleIntegration",
                                                                                                 "false" ) ).booleanValue() );
@@ -950,30 +950,21 @@
         }
     }
 
-    private static ConflictResolver determineConflictResolver(String className) {
+    private ConflictResolver determineConflictResolver(String className) {
         Class clazz = null;
         try {
-            clazz = Thread.currentThread().getContextClassLoader().loadClass( className );
+            clazz = this.classLoader.loadClass( className );
         } catch ( ClassNotFoundException e ) {
+            throw new IllegalArgumentException( "conflict Resolver '" + className + "' not found" );
         }
 
-        if ( clazz == null ) {
-            try {
-                clazz = RuleBaseConfiguration.class.getClassLoader().loadClass( className );
-            } catch ( ClassNotFoundException e ) {
-            }
-        }
 
-        if ( clazz != null ) {
-            try {
-                return (ConflictResolver) clazz.getMethod( "getInstance",
-                                                           null ).invoke( null,
-                                                                          null );
-            } catch ( Exception e ) {
-                throw new IllegalArgumentException( "Unable to set Conflict Resolver '" + className + "'" );
-            }
-        } else {
-            throw new IllegalArgumentException( "conflict Resolver '" + className + "' not found" );
+        try {
+            return (ConflictResolver) clazz.getMethod( "getInstance",
+                                                       null ).invoke( null,
+                                                                      null );
+        } catch ( Exception e ) {
+            throw new IllegalArgumentException( "Unable to set Conflict Resolver '" + className + "'" );
         }
     }