[jbpm-commits] JBoss JBPM SVN: r2500 - in jbpm3/trunk/modules/core/src: test/java/org/jbpm/instantiation and 1 other directory.

[do-not-reply at jboss.org]

Author: camunda
Date: 2008-10-07 10:20:14 -0400 (Tue, 07 Oct 2008)
New Revision: 2500

Modified:
   jbpm3/trunk/modules/core/src/main/java/org/jbpm/util/ClassLoaderUtil.java
   jbpm3/trunk/modules/core/src/test/java/org/jbpm/instantiation/ConfigurableClassloadersTest.java
Log:
fixed correct cleanup in tests (missing jbpmContext.close)

Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/util/ClassLoaderUtil.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/util/ClassLoaderUtil.java	2008-10-07 14:08:05 UTC (rev 2499)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/util/ClassLoaderUtil.java	2008-10-07 14:20:14 UTC (rev 2500)
@@ -72,8 +72,12 @@
       } else if (jbpmClassloader.equals("context")) {
         return Thread.currentThread().getContextClassLoader();
       } else if (jbpmClassloader.equals("custom")) {
-        String jbpmClassloaderClassname = JbpmConfiguration.Configs.getString("jbpm.customClassLoader.className");
+        String jbpmClassloaderClassname = null;
         try {
+          if (!JbpmConfiguration.Configs.hasObject("jbpm.customClassLoader.className")) {
+            throw new JbpmException("'jbpm.classloader' property set to 'custom' but 'jbpm.customClassLoader.className' is empty!");
+          }
+          jbpmClassloaderClassname = JbpmConfiguration.Configs.getString("jbpm.customClassLoader.className");
           if (jbpmClassloaderClassname == null) {
             throw new JbpmException("'jbpm.classloader' property set to 'custom' but 'jbpm.customClassLoader.className' is empty!");
           }

Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/instantiation/ConfigurableClassloadersTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/instantiation/ConfigurableClassloadersTest.java	2008-10-07 14:08:05 UTC (rev 2499)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/instantiation/ConfigurableClassloadersTest.java	2008-10-07 14:20:14 UTC (rev 2500)
@@ -23,6 +23,7 @@
 
 import org.jbpm.AbstractJbpmTestCase;
 import org.jbpm.JbpmConfiguration;
+import org.jbpm.JbpmConfigurationTestHelper;
 import org.jbpm.JbpmContext;
 import org.jbpm.graph.def.ProcessDefinition;
 
@@ -35,7 +36,7 @@
  * @author bernd.ruecker at camunda.com
  */
 public class ConfigurableClassloadersTest extends AbstractJbpmTestCase {
-
+  
   public void testDefaultBehavior() {
     JbpmConfiguration.getInstance();
     ClassLoader processClassLoader = JbpmConfiguration.getProcessClassLoader(null);
@@ -107,6 +108,8 @@
       fail("we should get an exception because custom class loader class not specified");
     }
     catch (Exception ex) {}
+    
+    jbpmContext.close();
     jbpmConfiguration.close();
   }