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

[Tom Elrod]

  User: telrod  
  Date: 06/07/15 00:40:12

  Modified:    src/main/org/jboss/remoting/transport  Connector.java
  Log:
  JBREM-543 & JBREM-542 & JBREM-539 - fixed servlet invoker and added sslservlet invoker.
  
  Revision  Changes    Path
  1.26      +7 -12     JBossRemoting/src/main/org/jboss/remoting/transport/Connector.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Connector.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/transport/Connector.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -b -r1.25 -r1.26
  --- Connector.java	20 Jun 2006 15:49:28 -0000	1.25
  +++ Connector.java	15 Jul 2006 04:40:12 -0000	1.26
  @@ -30,6 +30,7 @@
   import org.jboss.remoting.ServerInvoker;
   import org.jboss.remoting.marshal.MarshalFactory;
   import org.jboss.remoting.marshal.MarshallLoaderFactory;
  +import org.jboss.remoting.serialization.ClassLoaderUtility;
   import org.w3c.dom.Element;
   import org.w3c.dom.NamedNodeMap;
   import org.w3c.dom.Node;
  @@ -42,7 +43,6 @@
   import javax.management.ObjectName;
   import javax.net.ServerSocketFactory;
   import javax.net.SocketFactory;
  -
   import java.net.InetAddress;
   import java.util.HashMap;
   import java.util.Iterator;
  @@ -111,7 +111,7 @@
    * @author <a href="mailto:d_jencks at users.sourceforge.net">David Jencks</a>
    * @author <a href="mailto:juha at jboss.org">Juha Lindfors</a>
    * @author <a href="mailto:tom at jboss.org">Tom Elrod</a>
  - * @version $Revision: 1.25 $
  + * @version $Revision: 1.26 $
    * @jmx.mbean description = "An MBean wrapper around a ServerInvoker."
    * @jboss.xmbean
    */
  @@ -302,16 +302,9 @@
               create();
            }
   
  -         ClassLoader cl = Thread.currentThread().getContextClassLoader();
  -
  -         if (cl == null)
  -         {
  -            cl = getClass().getClassLoader();
  -         }
  -
            // want to have handlers registered before starting, so if someone makes invocation,
            // there is something to handle it.
  -         configureHandlers(cl);
  +         configureHandlers();
   
            // if marshaller loader not started, start it
            if (!isMarshallerLoader)
  @@ -575,7 +568,7 @@
         }
      }
   
  -   private void configureHandlers(ClassLoader cl)
  +   private void configureHandlers()
            throws Exception
      {
         if (xml != null)
  @@ -619,7 +612,9 @@
   
               if (!isObjName)
               {
  -               handler = (ServerInvocationHandler) cl.loadClass(handlerClass).newInstance();
  +               Class serverInvocationHandlerClass = ClassLoaderUtility.loadClass(handlerClass, Connector.class);
  +               handler = (ServerInvocationHandler) serverInvocationHandlerClass.newInstance();
  +//               handler = (ServerInvocationHandler) cl.loadClass(handlerClass).newInstance();
               }
   
               StringTokenizer tok = new StringTokenizer(subNode.getNodeValue(), ",");