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

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

Author: michael.neale at jboss.com
Date: 2008-09-22 23:43:09 -0400 (Mon, 22 Sep 2008)
New Revision: 23001

Modified:
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/ServiceImplementation.java
Log:
tidy up classloader

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/ServiceImplementation.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/ServiceImplementation.java	2008-09-23 03:31:03 UTC (rev 23000)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/ServiceImplementation.java	2008-09-23 03:43:09 UTC (rev 23001)
@@ -1225,11 +1225,11 @@
 					RoleTypes.PACKAGE_DEVELOPER);
 		}
 		PackageItem item = repository.loadPackageByUUID(packageUUID);
-		return buildPackage(selectorConfigName, force, item, Thread.currentThread().getContextClassLoader() );
+		return buildPackage(selectorConfigName, force, item );
 	}
 
 	private BuilderResult[] buildPackage(String selectorConfigName,
-			boolean force, PackageItem item, ClassLoader buildCl)
+			boolean force, PackageItem item)
 			throws DetailedSerializableException {
 		if (!force && item.isBinaryUpToDate()) {
 			// we can just return all OK if its up to date.
@@ -1270,7 +1270,7 @@
 			ContentPackageAssembler asm) throws Exception {
 		item.updateBinaryUpToDate(true);
 		RuleBaseConfiguration conf = new RuleBaseConfiguration();
-		// setting the MapBackedClassloader that is the parent of the builder classloader as the parent 
+		// setting the MapBackedClassloader that is the parent of the builder classloader as the parent
 		// of the rulebase classloader
 		conf.setClassLoader( asm.getBuilder().getRootClassLoader().getParent() );
 		RuleBase rb = RuleBaseFactory.newRuleBase( conf );
@@ -1608,7 +1608,7 @@
 					rb = loadRuleBase(item, buildCl);
 					this.ruleBaseCache.put(item.getUUID(), rb);
 				} else {
-					BuilderResult[] errs = this.buildPackage(null, false, item, buildCl);
+					BuilderResult[] errs = this.buildPackage(null, false, item);
 					if (errs == null || errs.length == 0) {
 						rb = loadRuleBase(item, buildCl);
 						this.ruleBaseCache.put(item.getUUID(), rb);
@@ -1718,7 +1718,7 @@
 					this.ruleBaseCache.put(item.getUUID(), loadRuleBase(item,
 							cl));
 				} else {
-					BuilderResult[] errs = this.buildPackage(null, false, item, cl);
+					BuilderResult[] errs = this.buildPackage(null, false, item);
 					if (errs == null || errs.length == 0) {
 						this.ruleBaseCache.put(item.getUUID(), loadRuleBase(
 								item, cl));