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

[Tom Elrod]

  User: telrod  
  Date: 07/01/12 12:19:47

  Modified:    src/main/org/jboss/remoting/transport/socket   Tag:
                        remoting_1_4 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
  No                   revision
  
  
  No                   revision
  
  
  1.30.2.2  +3 -12     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.30.2.1
  retrieving revision 1.30.2.2
  diff -u -b -r1.30.2.1 -r1.30.2.2
  --- SocketClientInvoker.java	28 Mar 2006 07:14:03 -0000	1.30.2.1
  +++ SocketClientInvoker.java	12 Jan 2007 17:19:47 -0000	1.30.2.2
  @@ -36,6 +36,7 @@
   import org.jboss.remoting.ConnectionFailedException;
   import org.jboss.remoting.InvokerLocator;
   import org.jboss.remoting.RemoteClientInvoker;
  +import org.jboss.remoting.serialization.ClassLoaderUtility;
   import org.jboss.remoting.marshal.Marshaller;
   import org.jboss.remoting.marshal.UnMarshaller;
   import org.jboss.remoting.marshal.serializable.SerializableMarshaller;
  @@ -48,7 +49,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.30.2.1 $
  + * @version $Revision: 1.30.2.2 $
    */
   public class SocketClientInvoker extends RemoteClientInvoker
   {
  @@ -489,17 +490,7 @@
      {
         if(clientSocketConstructor == null)
         {
  -         ClassLoader classLoader = getClassLoader();
  -         if(classLoader == null)
  -         {
  -            classLoader = Thread.currentThread().getContextClassLoader();
  -
  -            if(classLoader == null)
  -            {
  -               classLoader = getClass().getClassLoader();
  -            }
  -         }
  -         Class cl = classLoader.loadClass(clientSocketClassName);
  +         Class cl = ClassLoaderUtility.loadClass(getClass(), clientSocketClassName);
   
            try
            {
  
  
  
  1.21.2.2  +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.21.2.1
  retrieving revision 1.21.2.2
  diff -u -b -r1.21.2.1 -r1.21.2.2
  --- ServerThread.java	27 Sep 2006 17:17:33 -0000	1.21.2.1
  +++ ServerThread.java	12 Jan 2007 17:19:47 -0000	1.21.2.2
  @@ -38,6 +38,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;
   
   /**
    * This Thread object hold a single Socket connection to a client
  @@ -52,7 +53,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.21.2.1 $
  + * @version $Revision: 1.21.2.2 $
    */
   public class ServerThread extends Thread
   {
  @@ -155,18 +156,7 @@
      {
         if(serverSocketConstructor == null)
         {
  -         //ClassLoader classLoader = invoker.getClassLoader();
  -         ClassLoader classLoader = null;
  -         if(classLoader == null)
  -         {
  -            classLoader = Thread.currentThread().getContextClassLoader();
  -
  -            if(classLoader == null)
  -            {
  -               classLoader = getClass().getClassLoader();
  -            }
  -         }
  -         Class cl = classLoader.loadClass(serverSocketClass);
  +         Class cl = ClassLoaderUtility.loadClass(serverSocketClass, getClass());
   
            try
            {