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

[Tom Elrod]

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

  Modified:    src/main/org/jboss/remoting/transport/servlet  
                        ServletServerInvoker.java
                        TransportClientFactory.java
  Log:
  JBREM-543 & JBREM-542 & JBREM-539 - fixed servlet invoker and added sslservlet invoker.
  
  Revision  Changes    Path
  1.8       +13 -12    JBossRemoting/src/main/org/jboss/remoting/transport/servlet/ServletServerInvoker.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ServletServerInvoker.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/transport/servlet/ServletServerInvoker.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- ServletServerInvoker.java	6 Jan 2006 19:34:37 -0000	1.7
  +++ ServletServerInvoker.java	15 Jul 2006 04:40:11 -0000	1.8
  @@ -22,17 +22,6 @@
   
   package org.jboss.remoting.transport.servlet;
   
  -import java.io.ByteArrayInputStream;
  -import java.io.ByteArrayOutputStream;
  -import java.io.IOException;
  -import java.util.Enumeration;
  -import java.util.HashMap;
  -import java.util.Map;
  -import javax.servlet.ServletException;
  -import javax.servlet.ServletInputStream;
  -import javax.servlet.ServletOutputStream;
  -import javax.servlet.http.HttpServletRequest;
  -import javax.servlet.http.HttpServletResponse;
   import org.jboss.remoting.InvocationRequest;
   import org.jboss.remoting.InvokerLocator;
   import org.jboss.remoting.marshal.MarshalFactory;
  @@ -44,6 +33,18 @@
   import org.jboss.remoting.transport.web.WebServerInvoker;
   import org.jboss.remoting.transport.web.WebUtil;
   
  +import javax.servlet.ServletException;
  +import javax.servlet.ServletInputStream;
  +import javax.servlet.ServletOutputStream;
  +import javax.servlet.http.HttpServletRequest;
  +import javax.servlet.http.HttpServletResponse;
  +import java.io.ByteArrayInputStream;
  +import java.io.ByteArrayOutputStream;
  +import java.io.IOException;
  +import java.util.Enumeration;
  +import java.util.HashMap;
  +import java.util.Map;
  +
   /**
    * The servlet based server invoker that receives the original http request
    * from the ServerInvokerServlet.
  @@ -155,7 +156,7 @@
                                   HttpServletResponse response)
            throws ServletException, IOException
      {
  -      byte[] retval = null;
  +      byte[] retval = new byte[0];
   
         Map metadata = new HashMap();
   
  
  
  
  1.2       +2 -2      JBossRemoting/src/main/org/jboss/remoting/transport/servlet/TransportClientFactory.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: TransportClientFactory.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/transport/servlet/TransportClientFactory.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- TransportClientFactory.java	12 Jul 2006 04:49:50 -0000	1.1
  +++ TransportClientFactory.java	15 Jul 2006 04:40:11 -0000	1.2
  @@ -24,7 +24,7 @@
   import org.jboss.remoting.InvokerLocator;
   import org.jboss.remoting.transport.ClientFactory;
   import org.jboss.remoting.transport.ClientInvoker;
  -import org.jboss.remoting.transport.http.ssl.HTTPSClientInvoker;
  +import org.jboss.remoting.transport.http.HTTPClientInvoker;
   
   import java.io.IOException;
   import java.util.Map;
  @@ -36,7 +36,7 @@
   {
      public ClientInvoker createClientInvoker(InvokerLocator locator, Map config) throws IOException
      {
  -      return new HTTPSClientInvoker(locator, config);
  +      return new HTTPClientInvoker(locator, config);
      }
   
      public boolean supportsSSL()