[jboss-svn-commits] JBL Code SVN: r13526 - labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/builder.

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

Author: mark.proctor at jboss.com
Date: 2007-07-14 23:05:59 -0400 (Sat, 14 Jul 2007)
New Revision: 13526

Modified:
   labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/builder/BRMSPackageBuilder.java
Log:
JBRULES-1010 pluggeable Dialect Configuration.
-changed the default parent classloader

Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/builder/BRMSPackageBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/builder/BRMSPackageBuilder.java	2007-07-15 03:03:17 UTC (rev 13525)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/builder/BRMSPackageBuilder.java	2007-07-15 03:05:59 UTC (rev 13526)
@@ -59,8 +59,11 @@
      * using the given classpath.
      */
     public static BRMSPackageBuilder getInstance(List<JarInputStream> classpath) {
-
-    	MapBackedClassLoader loader = new MapBackedClassLoader( BRMSPackageBuilder.class.getClassLoader() );
+        ClassLoader parentClassLoader = Thread.currentThread().getContextClassLoader();
+        if ( parentClassLoader == null ) {
+            parentClassLoader = BRMSPackageBuilder.class.getClassLoader();
+        }
+    	MapBackedClassLoader loader = new MapBackedClassLoader( parentClassLoader );
         try {
             for ( JarInputStream jis : classpath ) {
                 JarEntry entry = null;
@@ -85,7 +88,7 @@
         // See if we can find a packagebuilder.conf
         // We do this manually here, as we cannot rely on PackageBuilder doing this correctly
         // note this chainedProperties already checks System properties too
-        ChainedProperties chainedProperties = new ChainedProperties( BRMSPackageBuilder.class.getClassLoader(),
+        ChainedProperties chainedProperties = new ChainedProperties( BRMSPackageBuilder.class.getClassLoader(), // pass this as it searches currentThread anyway
                                                                      "packagebuilder.conf",
                                                                      false ); // false means it ignores any default values