Author: ron.sigal(a)jboss.com Date: 2008-11-12 23:53:59 -0500 (Wed, 12 Nov 2008) New Revision: 4662 Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/loading/RemotingClassLoader.java Log: JBREM-1042: Renamed "remotingClassLoader" to "primaryClassLoader" and renamed "userClassLoader" to "secondaryClassLoader". 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 2008-11-13 04:52:33 UTC (rev 4661) +++ remoting2/branches/2.2/src/main/org/jboss/remoting/loading/RemotingClassLoader.java 2008-11-13 04:53:59 UTC (rev 4662) @@ -30,15 +30,15 @@ */ public class RemotingClassLoader extends ClassLoader { - private ClassLoader userClassLoader = null; + private ClassLoader secondaryClassLoader = null; protected static final Logger log = Logger.getLogger(RemotingClassLoader.class); protected static final boolean isTrace = log.isTraceEnabled(); - public RemotingClassLoader(ClassLoader remotingClassLoader, ClassLoader userClassLoader) + public RemotingClassLoader(ClassLoader primaryClassLoader, ClassLoader secondaryClassLoader) { - super(remotingClassLoader); - this.userClassLoader = userClassLoader; + super(primaryClassLoader); + this.secondaryClassLoader = secondaryClassLoader; } public Class loadClass(String name) throws ClassNotFoundException @@ -48,6 +48,7 @@ try { loadedClass = Class.forName(name, false, getParent()); + if (isTrace) log.trace("loaded from primary classloader: " + name); } catch(ClassNotFoundException e) { @@ -55,11 +56,12 @@ { log.trace("Could not load class (" + name + ") using parent remoting class loader (" + getParent() + ")"); } - if(userClassLoader != null) + if(secondaryClassLoader != null) { try { - loadedClass = Class.forName(name, false, userClassLoader); + loadedClass = Class.forName(name, false, secondaryClassLoader); + if (isTrace) log.trace("loaded from secondary classloader: " + name); } catch (ClassNotFoundException e1) {