[jboss-cvs] JBossRemoting/src/tests/org/jboss/test/remoting/classloader ...

[Tom Elrod]

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

  Modified:    src/tests/org/jboss/test/remoting/classloader 
                        InvokerClientTest.java
  Log:
  JBREM-659 - changed all ClassLoader.loadClass() calls to Class.forName() calls so will work with jdk 1.6
  
  Revision  Changes    Path
  1.6       +10 -10    JBossRemoting/src/tests/org/jboss/test/remoting/classloader/InvokerClientTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: InvokerClientTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/tests/org/jboss/test/remoting/classloader/InvokerClientTest.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- InvokerClientTest.java	30 Dec 2005 05:26:40 -0000	1.5
  +++ InvokerClientTest.java	12 Jan 2007 18:56:23 -0000	1.6
  @@ -22,6 +22,12 @@
   
   package org.jboss.test.remoting.classloader;
   
  +import junit.framework.TestCase;
  +import org.jboss.logging.Logger;
  +import org.jboss.remoting.invocation.NameBasedInvocation;
  +import org.jboss.test.remoting.ComplexReturn;
  +import org.jboss.test.remoting.transport.mock.MockTest;
  +
   import java.io.ByteArrayOutputStream;
   import java.io.File;
   import java.io.FileInputStream;
  @@ -30,12 +36,6 @@
   import java.net.URL;
   import java.net.URLClassLoader;
   import java.util.Map;
  -import org.jboss.logging.Logger;
  -import org.jboss.remoting.invocation.NameBasedInvocation;
  -import org.jboss.test.remoting.ComplexReturn;
  -import org.jboss.test.remoting.transport.mock.MockTest;
  -
  -import junit.framework.TestCase;
   
   
   /**
  @@ -83,11 +83,11 @@
         Object clientInstance = clientConstructor.newInstance(new Object[] {invokerLocatorInstance, "mock"});
         */
   
  -      Class invokerLocator = classloader.loadClass("org.jboss.remoting.InvokerLocator");
  +      Class invokerLocator = Class.forName("org.jboss.remoting.InvokerLocator", false, classloader);
         Constructor invokerLocatorConstructor = invokerLocator.getConstructor(new Class[]{String.class});
         Object invokerLocatorInstance = invokerLocatorConstructor.newInstance(new Object[]{transport + "://localhost:" + port});
   
  -      Class clientClz = classloader.loadClass("org.jboss.remoting.Client");
  +      Class clientClz = Class.forName("org.jboss.remoting.Client", false, classloader);
         Constructor clientConstructor = clientClz.getConstructor(new Class[]{invokerLocator, String.class});
         Object clientInstance = clientConstructor.newInstance(new Object[]{invokerLocatorInstance, "mock"});
   
  @@ -95,7 +95,7 @@
         System.out.println("context classloader: " + contextClassLoader);
         System.out.println("test classloader: " + classloader);
   
  -      contextClassLoader.loadClass("org.jboss.test.remoting.ComplexReturn");
  +      Class.forName("org.jboss.test.remoting.ComplexReturn", false, contextClassLoader);
   
   
         Method connectMethod = clientClz.getMethod("connect", new Class[]{});
  @@ -258,7 +258,7 @@
         {
            Class c = defineClass(className, classBytes, 0, classBytes.length);
            resolveClass(c);
  -         return loadClass(className);
  +         return Class.forName(className, false, this);
         }
      }