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

[Tom Elrod]

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

  Modified:    src/main/org/jboss/remoting/transport/socket   
                        MicroSocketClientInvoker.java
                        SocketClientInvoker.java ServerThread.java
  Log:
  JBREM-659 - changed all ClassLoader.loadClass() calls to Class.forName() calls so will work with jdk 1.6
  
  Revision  Changes    Path
  1.19      +3 -12     JBossRemoting/src/main/org/jboss/remoting/transport/socket/MicroSocketClientInvoker.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: MicroSocketClientInvoker.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/transport/socket/MicroSocketClientInvoker.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -b -r1.18 -r1.19
  --- MicroSocketClientInvoker.java	3 Nov 2006 04:06:21 -0000	1.18
  +++ MicroSocketClientInvoker.java	12 Jan 2007 18:56:22 -0000	1.19
  @@ -9,6 +9,7 @@
   import org.jboss.remoting.marshal.Marshaller;
   import org.jboss.remoting.marshal.UnMarshaller;
   import org.jboss.remoting.marshal.serializable.SerializableMarshaller;
  +import org.jboss.remoting.serialization.ClassLoaderUtility;
   import org.jboss.util.propertyeditor.PropertyEditors;
   
   import java.io.IOException;
  @@ -31,7 +32,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.18 $
  + * @version $Revision: 1.19 $
    */
   public class MicroSocketClientInvoker extends RemoteClientInvoker
   {
  @@ -736,19 +737,9 @@
      {
         if (clientSocketConstructor == null)
         {
  -         ClassLoader classLoader = getClassLoader();
  -         if (classLoader == null)
  -         {
  -            classLoader = Thread.currentThread().getContextClassLoader();
  -
  -            if (classLoader == null)
  -            {
  -               classLoader = getClass().getClassLoader();
  -            }
  -         }
            if(clientSocketClass == null)
            {
  -            clientSocketClass = classLoader.loadClass(clientSocketClassName);
  +            clientSocketClass = ClassLoaderUtility.loadClass(clientSocketClassName, getClass());
            }
   
            clientSocketConstructor = clientSocketClass.getConstructor(new Class[]{Socket.class});
  
  
  
  1.39      +4 -13     JBossRemoting/src/main/org/jboss/remoting/transport/socket/SocketClientInvoker.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SocketClientInvoker.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/transport/socket/SocketClientInvoker.java,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -b -r1.38 -r1.39
  --- SocketClientInvoker.java	20 Sep 2006 04:22:24 -0000	1.38
  +++ SocketClientInvoker.java	12 Jan 2007 18:56:22 -0000	1.39
  @@ -24,6 +24,7 @@
   
   import org.jboss.logging.Logger;
   import org.jboss.remoting.InvokerLocator;
  +import org.jboss.remoting.serialization.ClassLoaderUtility;
   
   import javax.net.SocketFactory;
   import java.io.IOException;
  @@ -39,7 +40,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.38 $
  + * @version $Revision: 1.39 $
    */
   public class SocketClientInvoker extends MicroSocketClientInvoker
   {
  @@ -130,19 +131,9 @@
      {
         if (clientSocketConstructor == null)
         {
  -         ClassLoader classLoader = getClassLoader();
  -         if (classLoader == null)
  -         {
  -            classLoader = Thread.currentThread().getContextClassLoader();
  -
  -            if (classLoader == null)
  -            {
  -               classLoader = getClass().getClassLoader();
  -            }
  -         }
            if(clientSocketClass == null)
            {
  -            clientSocketClass = classLoader.loadClass(clientSocketClassName);
  +            clientSocketClass = ClassLoaderUtility.loadClass(getClass(), clientSocketClassName);
            }
   
            try
  
  
  
  1.32      +3 -13     JBossRemoting/src/main/org/jboss/remoting/transport/socket/ServerThread.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ServerThread.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/transport/socket/ServerThread.java,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -b -r1.31 -r1.32
  --- ServerThread.java	21 Dec 2006 16:43:33 -0000	1.31
  +++ ServerThread.java	12 Jan 2007 18:56:22 -0000	1.32
  @@ -31,6 +31,7 @@
   import org.jboss.remoting.marshal.MarshalFactory;
   import org.jboss.remoting.marshal.Marshaller;
   import org.jboss.remoting.marshal.UnMarshaller;
  +import org.jboss.remoting.serialization.ClassLoaderUtility;
   
   import java.io.EOFException;
   import java.io.IOException;
  @@ -58,7 +59,7 @@
    *
    * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
    * @author <a href="mailto:tom at jboss.org">Tom Elrod</a>
  - * @version $Revision: 1.31 $
  + * @version $Revision: 1.32 $
    */
   public class ServerThread extends Thread
   {
  @@ -182,20 +183,9 @@
      {
         if (serverSocketConstructor == null)
         {
  -         //ClassLoader classLoader = invoker.getClassLoader();
  -         ClassLoader classLoader = null;
  -         if (classLoader == null)
  -         {
  -            classLoader = Thread.currentThread().getContextClassLoader();
  -
  -            if (classLoader == null)
  -            {
  -               classLoader = getClass().getClassLoader();
  -            }
  -         }
            if(serverSocketClass == null)
            {
  -            serverSocketClass = classLoader.loadClass(serverSocketClassName);
  +            serverSocketClass = ClassLoaderUtility.loadClass(serverSocketClassName, getClass());
            }
   
            try