[jboss-cvs] JBossRemoting/src/main/org/jboss/remoting ...

[Tom Elrod]

  User: telrod  
  Date: 07/01/12 13:56:22

  Modified:    src/main/org/jboss/remoting    InvokerRegistry.java
                        AbstractInvoker.java ServerInvoker.java
  Log:
  JBREM-659 - changed all ClassLoader.loadClass() calls to Class.forName() calls so will work with jdk 1.6
  
  Revision  Changes    Path
  1.35      +2 -2      JBossRemoting/src/main/org/jboss/remoting/InvokerRegistry.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: InvokerRegistry.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/InvokerRegistry.java,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -b -r1.34 -r1.35
  --- InvokerRegistry.java	20 Jul 2006 16:58:31 -0000	1.34
  +++ InvokerRegistry.java	12 Jan 2007 18:56:22 -0000	1.35
  @@ -48,7 +48,7 @@
    *
    * @author <a href="mailto:jhaynie at vocalocity.net">Jeff Haynie</a>
    * @author <a href="mailto:telrod at e2technologies.net">Tom Elrod</a>
  - * @version $Revision: 1.34 $
  + * @version $Revision: 1.35 $
    */
   public class InvokerRegistry
   {
  @@ -457,7 +457,7 @@
         if(transportFactoryClass == null)
         {
            String transportFactoryClassName = "org.jboss.remoting.transport." + protocol + ".TransportClientFactory";
  -         transportFactoryClass = ClassLoaderUtility.loadClass(transportFactoryClassName, InvokerRegistry.class);
  +         transportFactoryClass = ClassLoaderUtility.loadClass(InvokerRegistry.class, transportFactoryClassName);
            transportClientFactoryClasses.put(protocol, transportFactoryClass);
         }
         return transportFactoryClass;
  
  
  
  1.16      +3 -13     JBossRemoting/src/main/org/jboss/remoting/AbstractInvoker.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: AbstractInvoker.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/AbstractInvoker.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -b -r1.15 -r1.16
  --- AbstractInvoker.java	7 Dec 2006 02:58:11 -0000	1.15
  +++ AbstractInvoker.java	12 Jan 2007 18:56:22 -0000	1.16
  @@ -27,6 +27,7 @@
   import org.jboss.remoting.loading.ClassByteClassLoader;
   import org.jboss.remoting.marshal.MarshallLoaderFactory;
   import org.jboss.remoting.security.SSLSocketBuilder;
  +import org.jboss.remoting.serialization.ClassLoaderUtility;
   import org.jboss.remoting.serialization.SerializationStreamFactory;
   import org.jboss.util.id.GUID;
   
  @@ -47,7 +48,7 @@
    *
    * @author <a href="mailto:jhaynie at vocalocity.net">Jeff Haynie</a>
    * @author <a href="mailto:telrod at e2technologies.net">Tom Elrod</a>
  - * @version $Revision: 1.15 $
  + * @version $Revision: 1.16 $
    */
   public abstract class AbstractInvoker implements Invoker
   {
  @@ -276,20 +277,9 @@
            String socketFactoryString = (String)configuration.get(Remoting.SOCKET_FACTORY_NAME);
            if(socketFactoryString != null && socketFactoryString.length() > 0)
            {
  -            //ClassLoader classLoader = invoker.getClassLoader();
  -            ClassLoader classLoader = null;
  -            if(classLoader == null)
  -            {
  -               classLoader = Thread.currentThread().getContextClassLoader();
  -
  -               if(classLoader == null)
  -               {
  -                  classLoader = getClass().getClassLoader();
  -               }
  -            }
               try
               {
  -               Class cl = classLoader.loadClass(socketFactoryString);
  +               Class cl = ClassLoaderUtility.loadClass(socketFactoryString,  getClass());
   
                  Constructor socketFactoryConstructor = null;
                  socketFactoryConstructor = cl.getConstructor(new Class[]{});
  
  
  
  1.58      +4 -14     JBossRemoting/src/main/org/jboss/remoting/ServerInvoker.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ServerInvoker.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/ServerInvoker.java,v
  retrieving revision 1.57
  retrieving revision 1.58
  diff -u -b -r1.57 -r1.58
  --- ServerInvoker.java	11 Jan 2007 05:22:04 -0000	1.57
  +++ ServerInvoker.java	12 Jan 2007 18:56:22 -0000	1.58
  @@ -31,6 +31,7 @@
   import org.jboss.remoting.security.SSLSocketBuilder;
   import org.jboss.remoting.security.ServerSocketFactoryMBean;
   import org.jboss.remoting.security.ServerSocketFactoryWrapper;
  +import org.jboss.remoting.serialization.ClassLoaderUtility;
   import org.jboss.remoting.stream.StreamHandler;
   import org.jboss.remoting.stream.StreamInvocationHandler;
   import org.jboss.remoting.transport.PortUtil;
  @@ -58,7 +59,7 @@
    *
    * @author <a href="mailto:jhaynie at vocalocity.net">Jeff Haynie</a>
    * @author <a href="mailto:tom.elrod at jboss.com">Tom Elrod</a>
  - * @version $Revision: 1.57 $
  + * @version $Revision: 1.58 $
    */
   public abstract class ServerInvoker extends AbstractInvoker implements ServerInvokerMBean
   {
  @@ -428,20 +429,9 @@
                  // couldn't create from object name for mbean service, will try by class name
                  if(serverSocketFactory == null)
                  {
  -                  //ClassLoader classLoader = invoker.getClassLoader();
  -                  ClassLoader classLoader = null;
  -                  if(classLoader == null)
  -                  {
  -                     classLoader = Thread.currentThread().getContextClassLoader();
  -
  -                     if(classLoader == null)
  -                     {
  -                        classLoader = getClass().getClassLoader();
  -                     }
  -                  }
                     try
                     {
  -                     Class cl = classLoader.loadClass(serverSocketFactoryString);
  +                     Class cl = ClassLoaderUtility.loadClass(serverSocketFactoryString, getClass());
   
                        Constructor serverSocketConstructor = null;
                        serverSocketConstructor = cl.getConstructor(new Class[]{});
  @@ -714,7 +704,7 @@
               {
                  try
                  {
  -                  onewayThreadPool = (ThreadPool) getClassLoader().loadClass(onewayThreadPoolClass).newInstance();
  +                  onewayThreadPool = (ThreadPool) Class.forName(onewayThreadPoolClass, false, getClassLoader()).newInstance();
                  }
                  catch(Exception e)
                  {