[jboss-remoting-commits] JBoss Remoting SVN: r5199 - remoting2/branches/2.2/src/main/org/jboss/remoting/loading.

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

Author: ron.sigal at jboss.com
Date: 2009-05-12 02:00:58 -0400 (Tue, 12 May 2009)
New Revision: 5199

Modified:
   remoting2/branches/2.2/src/main/org/jboss/remoting/loading/RemotingClassLoader.java
Log:
JBREM-1127: If loadClass() gets a null primaryClassLoader, it will get the thread context classloader.

Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/loading/RemotingClassLoader.java
===================================================================
--- remoting2/branches/2.2/src/main/org/jboss/remoting/loading/RemotingClassLoader.java	2009-05-12 05:59:39 UTC (rev 5198)
+++ remoting2/branches/2.2/src/main/org/jboss/remoting/loading/RemotingClassLoader.java	2009-05-12 06:00:58 UTC (rev 5199)
@@ -47,7 +47,12 @@
 
       try
       {
-         loadedClass = Class.forName(name, false, getParent());
+         ClassLoader primaryClassLoader = getParent();
+         if (primaryClassLoader == null)
+         {
+            primaryClassLoader = Thread.currentThread().getContextClassLoader();
+         }
+         loadedClass = Class.forName(name, false, primaryClassLoader);
          if (isTrace) log.trace("loaded from primary classloader: " + name);
       }
       catch(ClassNotFoundException e)