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

[Tom Elrod]

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

  Modified:    src/main/org/jboss/remoting/serialization/impl/java 
                        MarshalledValueInputStream.java
  Log:
  JBREM-659 - changed all ClassLoader.loadClass() calls to Class.forName() calls so will work with jdk 1.6
  
  Revision  Changes    Path
  1.3       +5 -4      JBossRemoting/src/main/org/jboss/remoting/serialization/impl/java/MarshalledValueInputStream.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: MarshalledValueInputStream.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/serialization/impl/java/MarshalledValueInputStream.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- MarshalledValueInputStream.java	30 Dec 2005 05:26:35 -0000	1.2
  +++ MarshalledValueInputStream.java	12 Jan 2007 18:56:22 -0000	1.3
  @@ -23,12 +23,13 @@
   
   package org.jboss.remoting.serialization.impl.java;
   
  +import org.jboss.logging.Logger;
  +
   import java.io.IOException;
   import java.io.InputStream;
   import java.io.ObjectInputStream;
   import java.io.ObjectStreamClass;
   import java.lang.reflect.Proxy;
  -import org.jboss.logging.Logger;
   
   /**
    * An ObjectInputStream subclass used by the MarshalledValue class to
  @@ -37,7 +38,7 @@
    *
    * @author Scott.Stark at jboss.org
    * @author Clebert.suconic at jboss.org - refactored packages only
  - * @version $Revision: 1.2 $
  + * @version $Revision: 1.3 $
    */
   public class MarshalledValueInputStream
         extends ObjectInputStream
  @@ -70,7 +71,7 @@
            ClassLoader loader = Thread.currentThread().getContextClassLoader();
            try
            {
  -            resolvedClass = loader.loadClass(className);
  +            resolvedClass = Class.forName(className, false, loader);
            }
            catch(ClassNotFoundException e)
            {
  @@ -118,7 +119,7 @@
               {
                  loader = Thread.currentThread().getContextClassLoader();
               }
  -            iface = loader.loadClass(className);
  +            iface = Class.forName(className, false, loader);
            }
            ifaceClasses[i] = iface;
         }