[jboss-remoting-commits] JBoss Remoting SVN: r5280 - 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-19 16:51:11 -0400 (Tue, 19 May 2009)
New Revision: 5280

Modified:
   remoting2/branches/2.2/src/main/org/jboss/remoting/loading/RemotingClassLoader.java
Log:
JBREM-1127: Added useCurrentThreadClassLoader variable.

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-19 20:50:24 UTC (rev 5279)
+++ remoting2/branches/2.2/src/main/org/jboss/remoting/loading/RemotingClassLoader.java	2009-05-19 20:51:11 UTC (rev 5280)
@@ -31,7 +31,8 @@
 public class RemotingClassLoader extends ClassLoader
 {
    private ClassLoader secondaryClassLoader = null;
-
+   private boolean useCurrentThreadClassLoader;
+   
    protected static final Logger log = Logger.getLogger(RemotingClassLoader.class);
    protected static final boolean isTrace = log.isTraceEnabled();
 
@@ -47,12 +48,7 @@
 
       try
       {
-         ClassLoader primaryClassLoader = getParent();
-         if (primaryClassLoader == null)
-         {
-            primaryClassLoader = Thread.currentThread().getContextClassLoader();
-         }
-         loadedClass = Class.forName(name, false, primaryClassLoader);
+         loadedClass = Class.forName(name, false, getParent());
          if (isTrace) log.trace("loaded from primary classloader: " + name);
       }
       catch(ClassNotFoundException e)
@@ -86,4 +82,18 @@
       return loadedClass;
    }
 
+   public String toString()
+   {
+      return  "RemotingClassLoader[" + System.identityHashCode(this) + ":" + getParent() + "]";
+   }
+
+   public boolean isUseCurrentThreadClassLoader()
+   {
+      return useCurrentThreadClassLoader;
+   }
+
+   public void setUseCurrentThreadClassLoader(boolean useCurrentThreadClassLoader)
+   {
+      this.useCurrentThreadClassLoader = useCurrentThreadClassLoader;
+   }
 }
\ No newline at end of file