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

[Timothy Fox]

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

  Modified:    src/main/org/jboss/remoting  Tag: remoting_2_x
                        MicroRemoteClientInvoker.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.7.2.12  +7 -7      JBossRemoting/src/main/org/jboss/remoting/MicroRemoteClientInvoker.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: MicroRemoteClientInvoker.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/MicroRemoteClientInvoker.java,v
  retrieving revision 1.7.2.11
  retrieving revision 1.7.2.12
  diff -u -b -r1.7.2.11 -r1.7.2.12
  --- MicroRemoteClientInvoker.java	29 Jan 2007 07:10:00 -0000	1.7.2.11
  +++ MicroRemoteClientInvoker.java	31 Jan 2007 20:22:08 -0000	1.7.2.12
  @@ -27,7 +27,7 @@
    *
    * @author <a href="mailto:jhaynie at vocalocity.net">Jeff Haynie</a>
    * @author <a href="mailto:telrod at e2technologies.net">Tom Elrod</a>
  - * @version $Revision: 1.7.2.11 $
  + * @version $Revision: 1.7.2.12 $
    */
   public abstract class MicroRemoteClientInvoker extends AbstractInvoker implements ClientInvoker
   {
  @@ -83,14 +83,14 @@
            }
         }
   
  +      if (unmarshaller == null)
  +      {
         // creating a new classloader containing the remoting class loader (for remote classloading)
         // and the current thread's class loader.  This allows to load remoting classes as well as
         // user's classes.
         ClassLoader remotingClassLoader =
            new RemotingClassLoader(getClassLoader(), Thread.currentThread().getContextClassLoader());
   
  -      if (unmarshaller == null)
  -      {
            // try by locator (in case unmarshaller class name specified)
            unmarshaller = MarshalFactory.getUnMarshaller(getLocator(), getClassLoader());
            if (unmarshaller == null)