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

[Tom Elrod]

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

  Modified:    src/main/org/jboss/remoting/marshal/http 
                        HTTPUnMarshaller.java
  Log:
  JBREM-543 & JBREM-542 & JBREM-539 - fixed servlet invoker and added sslservlet invoker.
  
  Revision  Changes    Path
  1.9       +9 -7      JBossRemoting/src/main/org/jboss/remoting/marshal/http/HTTPUnMarshaller.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: HTTPUnMarshaller.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/marshal/http/HTTPUnMarshaller.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -b -r1.8 -r1.9
  --- HTTPUnMarshaller.java	30 Dec 2005 05:26:30 -0000	1.8
  +++ HTTPUnMarshaller.java	15 Jul 2006 04:40:10 -0000	1.9
  @@ -22,6 +22,12 @@
   
   package org.jboss.remoting.marshal.http;
   
  +import org.jboss.logging.Logger;
  +import org.jboss.remoting.marshal.UnMarshaller;
  +import org.jboss.remoting.marshal.serializable.SerializableUnMarshaller;
  +import org.jboss.remoting.transport.http.HTTPMetadataConstants;
  +import org.jboss.remoting.transport.web.WebUtil;
  +
   import java.io.BufferedReader;
   import java.io.ByteArrayInputStream;
   import java.io.ByteArrayOutputStream;
  @@ -30,11 +36,6 @@
   import java.io.InputStreamReader;
   import java.util.List;
   import java.util.Map;
  -import org.jboss.logging.Logger;
  -import org.jboss.remoting.marshal.UnMarshaller;
  -import org.jboss.remoting.marshal.serializable.SerializableUnMarshaller;
  -import org.jboss.remoting.transport.http.HTTPMetadataConstants;
  -import org.jboss.remoting.transport.web.WebUtil;
   
   /**
    * @author <a href="mailto:telrod at e2technologies.net">Tom Elrod</a>
  @@ -124,9 +125,10 @@
         }
   
         boolean isBinary = isBinaryData(metadata);
  -      boolean isError = isErrorReturn(metadata);
  +      //boolean isError = isErrorReturn(metadata);
   
  -      if(isBinary || isError)
  +      //if(isBinary || isError)
  +      if(isBinary)
         {
            return super.read(new ByteArrayInputStream(totalByteArray), metadata);
         }