[Mc4j-cvs] SF.net SVN: mc4j:[612] trunk/mc4j/modules/ems

[<ian...@us...>]

Revision: 612
          http://mc4j.svn.sourceforge.net/mc4j/?rev=612&view=rev
Author:   ianpspringer
Date:     2009-07-16 23:59:00 +0000 (Thu, 16 Jul 2009)

Log Message:
-----------
we need the ems impl jar added to the classloader even when the useContextClassLoader option is specified

Modified Paths:
--------------
    trunk/mc4j/modules/ems/build.xml
    trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/support/classloader/ClassLoaderFactory.java

Modified: trunk/mc4j/modules/ems/build.xml
===================================================================
--- trunk/mc4j/modules/ems/build.xml	2009-07-16 22:29:29 UTC (rev 611)
+++ trunk/mc4j/modules/ems/build.xml	2009-07-16 23:59:00 UTC (rev 612)
@@ -30,7 +30,7 @@
 
     <property name="module.jar" value="org-mc4j-ems.jar"/>
 
-    <property name="release.version" value="1.2.10"/>
+    <property name="release.version" value="1.2.11"/>
 
 
     <target

Modified: trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/support/classloader/ClassLoaderFactory.java
===================================================================
--- trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/support/classloader/ClassLoaderFactory.java	2009-07-16 22:29:29 UTC (rev 611)
+++ trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/support/classloader/ClassLoaderFactory.java	2009-07-16 23:59:00 UTC (rev 612)
@@ -175,17 +175,20 @@
 
     public ClassLoader buildClassLoader(ConnectionSettings settings) {
 
-        Boolean useContextClassLoader = Boolean.valueOf(settings.getAdvancedProperties().getProperty(ConnectionFactory.USE_CONTEXT_CLASSLOADER, "false"));
-        if (useContextClassLoader.booleanValue()) {
-            return Thread.currentThread().getContextClassLoader();
-        }
-
         String tempDirString = (String) settings.getControlProperties().get(ConnectionFactory.JAR_TEMP_DIR);
         File tempDir = null;
         if (tempDirString != null) {
             tempDir = new File(tempDirString);
         }
 
+        Boolean useContextClassLoader = Boolean.valueOf(settings.getAdvancedProperties().getProperty(ConnectionFactory.USE_CONTEXT_CLASSLOADER, "false"));
+        if (useContextClassLoader.booleanValue()) {
+            ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
+            URL implURL = storeImplToTemp("org-mc4j-ems-impl.jar", tempDir);        
+            ClassLoader loader = new URLClassLoader(new URL[] {implURL}, contextClassLoader);
+            return loader;
+        }
+
         List<URL> entries = new ArrayList<URL>();
 
         if (settings.getClassPathEntries() != null) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.