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

[Tom Elrod]

  User: telrod  
  Date: 07/01/11 15:34:50

  Modified:    src/main/org/jboss/remoting/transport/http/ssl  Tag:
                        remoting_2_x HTTPSClientInvoker.java
  Log:
  JBREM-659 - updated classloading to use Class.forName() instead of ClassLoader.loadClass() because the later is broken in jdk 1.6.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.11.4.1  +9 -13     JBossRemoting/src/main/org/jboss/remoting/transport/http/ssl/HTTPSClientInvoker.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: HTTPSClientInvoker.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/transport/http/ssl/HTTPSClientInvoker.java,v
  retrieving revision 1.11
  retrieving revision 1.11.4.1
  diff -u -b -r1.11 -r1.11.4.1
  --- HTTPSClientInvoker.java	15 Jul 2006 04:40:10 -0000	1.11
  +++ HTTPSClientInvoker.java	11 Jan 2007 20:34:50 -0000	1.11.4.1
  @@ -24,6 +24,7 @@
   
   import org.jboss.remoting.Client;
   import org.jboss.remoting.InvokerLocator;
  +import org.jboss.remoting.serialization.ClassLoaderUtility;
   import org.jboss.remoting.security.SSLSocketBuilder;
   import org.jboss.remoting.transport.http.HTTPClientInvoker;
   
  @@ -153,14 +154,9 @@
            hostnameVerifierString = (String)configuration.get(HOSTNAME_VERIFIER);
         if(hostnameVerifierString != null && hostnameVerifierString.length() > 0)
         {
  -         ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
  -         if(classLoader == null)
  -         {
  -            classLoader = getClass().getClassLoader();
  -         }
            try
            {
  -            Class cl = classLoader.loadClass(hostnameVerifierString);
  +            Class cl = ClassLoaderUtility.loadClass(hostnameVerifierString, getClass());
               Constructor constructor = cl.getConstructor(new Class[]{});
               hostnameVerifier = (HostnameVerifier) constructor.newInstance(new Object[] {});
               log.trace("HostnameVerifier (" + hostnameVerifierString + ") loaded");