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

[Tom Elrod]

  User: telrod  
  Date: 06/11/09 15:46:29

  Modified:    src/main/org/jboss/remoting   Tag: remoting_2_x Client.java
                        AbstractInvoker.java
  Log:
  JBREM-622 - fixed problem with having same callback handler registered multiple times.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.53.2.2  +2 -2      JBossRemoting/src/main/org/jboss/remoting/Client.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Client.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/Client.java,v
  retrieving revision 1.53.2.1
  retrieving revision 1.53.2.2
  diff -u -b -r1.53.2.1 -r1.53.2.2
  --- Client.java	9 Nov 2006 20:33:58 -0000	1.53.2.1
  +++ Client.java	9 Nov 2006 20:46:29 -0000	1.53.2.2
  @@ -63,7 +63,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.53.2.1 $
  + * @version $Revision: 1.53.2.2 $
    */
   public class Client implements Externalizable
   {
  @@ -1079,7 +1079,7 @@
            if (callbackHandler != null)
            {
               // first need to see if is push or pull callback (i.e. does have locator associated with it)
  -            String listenerId = (String)listeners.get(callbackHandler);
  +            String listenerId = (String)listeners.remove(callbackHandler);
               if(listenerId != null)
               {
                  // have a pull callback handler
  
  
  
  1.12.4.2  +9 -1      JBossRemoting/src/main/org/jboss/remoting/AbstractInvoker.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: AbstractInvoker.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/AbstractInvoker.java,v
  retrieving revision 1.12.4.1
  retrieving revision 1.12.4.2
  diff -u -b -r1.12.4.1 -r1.12.4.2
  --- AbstractInvoker.java	9 Nov 2006 20:33:58 -0000	1.12.4.1
  +++ AbstractInvoker.java	9 Nov 2006 20:46:29 -0000	1.12.4.2
  @@ -47,7 +47,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.12.4.1 $
  + * @version $Revision: 1.12.4.2 $
    */
   public abstract class AbstractInvoker implements Invoker
   {
  @@ -179,6 +179,14 @@
                  CallbackLocatorHolder locatorHolder = new CallbackLocatorHolder(listenerId, holder.getLocator());
                  holderList.add(locatorHolder);
               }
  +            // now remove holders
  +            if(holderList.size() > 0)
  +            {
  +               for(int x = 0; x < holderList.size(); x++)
  +               {
  +                  localServerLocators.remove(((CallbackLocatorHolder)holderList.get(x)).getListenerId());
  +               }
  +            }
            }
         }
            return holderList;