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

[Timothy Fox]

  User: timfox  
  Date: 07/01/31 15:22:08

  Modified:    src/main/org/jboss/remoting/transport/socket  Tag:
                        remoting_2_x ServerThread.java
  Log:
  Fix to prevent wrapping of PONG twice in an InvocationResponse
  Slight optimisation in MicroRemoteClientInvoker so classloader isn't created redundantly when not needed
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.29.2.14 +10 -4     JBossRemoting/src/main/org/jboss/remoting/transport/socket/ServerThread.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ServerThread.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/transport/socket/ServerThread.java,v
  retrieving revision 1.29.2.13
  retrieving revision 1.29.2.14
  diff -u -b -r1.29.2.13 -r1.29.2.14
  --- ServerThread.java	29 Jan 2007 05:33:09 -0000	1.29.2.13
  +++ ServerThread.java	31 Jan 2007 20:22:08 -0000	1.29.2.14
  @@ -64,7 +64,7 @@
    * @author <a href="mailto:tom at jboss.org">Tom Elrod</a>
    * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
    *
  - * @version $Revision: 1.29.2.13 $
  + * @version $Revision: 1.29.2.14 $
    */
   public class ServerThread extends Thread
   {
  @@ -571,10 +571,16 @@
         {
            if(!createdInvocationRequest)
            {
  +            // In the case of a pong - the response will ALREADY be an InvocationResponse
  +            // so we don't want to wrap it again in another InvocationResponse!
  +            
  +            if (!(resp instanceof InvocationResponse))
  +            {               
               // need to return invocation response
               if(trace) { log.trace("creating response instance"); }
               resp = new InvocationResponse(req.getSessionId(), resp, isError, req.getReturnPayload());
            }
  +         }
   
            OutputStream outputStream = socketWrapper.getOutputStream();
            if (performVersioning)