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

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

Author: mark.proctor at jboss.com
Date: 2010-10-20 15:14:25 -0400 (Wed, 20 Oct 2010)
New Revision: 35602

Modified:
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/SessionConfiguration.java
Log:
-changed it over to use the "this.classloader" member

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/SessionConfiguration.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/SessionConfiguration.java	2010-10-20 19:02:22 UTC (rev 35601)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/SessionConfiguration.java	2010-10-20 19:14:25 UTC (rev 35602)
@@ -294,17 +294,10 @@
                                                                "org.drools.process.instance.impl.DefaultWorkItemManagerFactory" );
         Class<WorkItemManagerFactory> clazz = null;
         try {
-            clazz = (Class<WorkItemManagerFactory>) Thread.currentThread().getContextClassLoader().loadClass( className );
+            clazz = (Class<WorkItemManagerFactory>) this.classLoader.loadClass( className );
         } catch ( ClassNotFoundException e ) {
         }
 
-        if ( clazz == null ) {
-            try {
-                clazz = (Class<WorkItemManagerFactory>) SessionConfiguration.class.getClassLoader().loadClass( className );
-            } catch ( ClassNotFoundException e ) {
-            }
-        }
-
         if ( clazz != null ) {
             try {
                 this.workItemManagerFactory = clazz.newInstance();
@@ -348,17 +341,11 @@
 
         Class<CommandService> clazz = null;
         try {
-            clazz = (Class<CommandService>) Thread.currentThread().getContextClassLoader().loadClass( className );
+            clazz = (Class<CommandService>) this.classLoader.loadClass( className );
         } catch ( ClassNotFoundException e ) {
         }
 
-        if ( clazz == null ) {
-            try {
-                clazz = (Class<CommandService>) SessionConfiguration.class.getClassLoader().loadClass( className );
-            } catch ( ClassNotFoundException e ) {
-            }
-        }
-
+        
         if ( clazz != null ) {
             try {
                 this.commandService = clazz.getConstructor( KnowledgeBase.class,
@@ -385,19 +372,10 @@
 
 		Class<TimerService> clazz = null;
 		try {
-			clazz = (Class<TimerService>) Thread.currentThread()
-					.getContextClassLoader().loadClass(className);
+			clazz = (Class<TimerService>) this.classLoader.loadClass(className);
 		} catch (ClassNotFoundException e) {
 		}
 
-		if (clazz == null) {
-			try {
-				clazz = (Class<TimerService>) SessionConfiguration.class
-					.getClassLoader().loadClass(className);
-			} catch (ClassNotFoundException e) {
-			}
-		}
-
 		if (clazz != null) {
 			try {
 				return clazz.newInstance();