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

[Ron Sigal]

  User: rsigal  
  Date: 07/10/31 22:17:15

  Modified:    src/main/org/jboss/remoting/transport/http  Tag:
                        remoting_2_x HTTPClientInvoker.java
  Log:
  JBREM-675:  Backed out special exception handling for servlet transport, which is no longer needed.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.31.2.10 +3 -32     JBossRemoting/src/main/org/jboss/remoting/transport/http/HTTPClientInvoker.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: HTTPClientInvoker.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/transport/http/HTTPClientInvoker.java,v
  retrieving revision 1.31.2.9
  retrieving revision 1.31.2.10
  diff -u -b -r1.31.2.9 -r1.31.2.10
  --- HTTPClientInvoker.java	11 Oct 2007 04:55:38 -0000	1.31.2.9
  +++ HTTPClientInvoker.java	1 Nov 2007 02:17:15 -0000	1.31.2.10
  @@ -39,7 +39,6 @@
   import org.jboss.remoting.marshal.http.HTTPMarshaller;
   import org.jboss.remoting.marshal.serializable.SerializableUnMarshaller;
   import org.jboss.remoting.serialization.ClassLoaderUtility;
  -import org.jboss.remoting.transport.servlet.ServletThrowable;
   import org.jboss.remoting.transport.web.WebUtil;
   import org.jboss.util.Base64;
   import org.jboss.util.threadpool.BasicThreadPool;
  @@ -335,10 +334,7 @@
         }
   
         // now check for error response and throw exception unless configured to not do so
  -      if(responseCode >= 400 
  -            || ("servlet".equals(getLocator().getProtocol())
  -                  && result instanceof InvocationResponse
  -                  && ((InvocationResponse) result).getResult() instanceof ServletThrowable))
  +      if(responseCode >= 400)
         {
            if(metadata != null)
            {
  @@ -356,16 +352,7 @@
                     }
                     else if (result instanceof InvocationResponse)
                     {
  -                     InvocationResponse response = (InvocationResponse) result;
  -                     Object innerResult = response.getResult();
  -                     if (innerResult instanceof ServletThrowable)
  -                     {
  -                        return ((ServletThrowable) innerResult).getCause();
  -                     }
  -                     else
  -                     {
  -                        return innerResult;
  -                     }
  +                     return ((InvocationResponse) result).getResult();
                     }
                     else
                     {
  @@ -381,23 +368,7 @@
            // In this case, MicroRemoteClientInvoker will throw the exception carried by
            // the InvocationResponse.
            if (result instanceof InvocationResponse)
  -         {
  -            if ((((InvocationResponse) result).getResult()) instanceof ServletThrowable)
  -            {
  -               InvocationResponse response = (InvocationResponse) result;
  -               ServletThrowable st = (ServletThrowable) response.getResult();
  -               Throwable t = st.getCause();
  -               InvocationResponse ir = new InvocationResponse(response.getSessionId(),
  -                                                              t,
  -                                                              response.isException(),
  -                                                              response.getPayload());
  -               return ir;
  -            }
  -            else
  -            {
                  return result;
  -            }
  -         }
   
            // Otherwise, create a new WebServerError.
            if(result instanceof String)