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

[Ron Sigal]

  User: rsigal  
  Date: 07/08/20 02:03:04

  Modified:    src/main/org/jboss/remoting  Tag:
                        remoting_2_2_2_experimental ServerInvoker.java
  Log:
  JBREM-782:  In getCallbackHandler() moved ServerInvokerCallbackHandler() back inside synch block and call ServerInvokerCallbackHandler.connect() outside of synch block.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.52.2.28.4.3.2.2 +5 -8      JBossRemoting/src/main/org/jboss/remoting/ServerInvoker.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ServerInvoker.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/ServerInvoker.java,v
  retrieving revision 1.52.2.28.4.3.2.1
  retrieving revision 1.52.2.28.4.3.2.2
  diff -u -b -r1.52.2.28.4.3.2.1 -r1.52.2.28.4.3.2.2
  --- ServerInvoker.java	18 Aug 2007 01:07:29 -0000	1.52.2.28.4.3.2.1
  +++ ServerInvoker.java	20 Aug 2007 06:03:04 -0000	1.52.2.28.4.3.2.2
  @@ -67,7 +67,7 @@
    * @author <a href="mailto:tom.elrod at jboss.com">Tom Elrod</a>
    * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
    *
  - * @version $Revision: 1.52.2.28.4.3.2.1 $
  + * @version $Revision: 1.52.2.28.4.3.2.2 $
    */
   public abstract class ServerInvoker extends AbstractInvoker implements ServerInvokerMBean
   {
  @@ -1695,19 +1695,16 @@
         synchronized(callbackHandlers)
         {
            callbackHandler = (ServerInvokerCallbackHandler)callbackHandlers.get(id);
  -      }
         
         // if does not exist, create it
         if(callbackHandler == null)
         {
            callbackHandler = new ServerInvokerCallbackHandler(invocation, getLocator(), this);
  -
  -         synchronized(callbackHandlers)
  -         {
               callbackHandlers.put(id, callbackHandler);
            }
         }
   
  +      callbackHandler.connect();
         if(trace) { log.trace("ServerInvoker (" + this + ") adding server callback handler " + callbackHandler + " with id of " + id + "."); }
         return callbackHandler;
      }