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

[Ron Sigal]

  User: rsigal  
  Date: 07/08/02 02:57:14

  Modified:    src/main/org/jboss/remoting  Tag: remoting_2_2_0_GA
                        ServerInvoker.java
  Log:
  JBREM-782:  In getCallbackHandler() broke up synchronization block into two blocks without call to ServerInvokerCallbackHandler constructor.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.52.2.28.4.1 +8 -4      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
  retrieving revision 1.52.2.28.4.1
  diff -u -b -r1.52.2.28 -r1.52.2.28.4.1
  --- ServerInvoker.java	16 Feb 2007 04:17:30 -0000	1.52.2.28
  +++ ServerInvoker.java	2 Aug 2007 06:57:14 -0000	1.52.2.28.4.1
  @@ -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 $
  + * @version $Revision: 1.52.2.28.4.1 $
    */
   public abstract class ServerInvoker extends AbstractInvoker implements ServerInvokerMBean
   {
  @@ -1648,11 +1648,15 @@
         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);
            }
         }