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

[Tom Elrod]

  User: telrod  
  Date: 06/11/16 12:57:02

  Modified:    src/main/org/jboss/remoting  Tag: remoting_2_x
                        AbstractInvoker.java
  Log:
  JBREM-622 - fixed bug where was getting all handlers for removal instead of checking just for the one passed as a parameter.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.12.4.3  +12 -4     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.2
  retrieving revision 1.12.4.3
  diff -u -b -r1.12.4.2 -r1.12.4.3
  --- AbstractInvoker.java	9 Nov 2006 20:46:29 -0000	1.12.4.2
  +++ AbstractInvoker.java	16 Nov 2006 17:57:02 -0000	1.12.4.3
  @@ -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.2 $
  + * @version $Revision: 1.12.4.3 $
    */
   public abstract class AbstractInvoker implements Invoker
   {
  @@ -126,7 +126,11 @@
            while(itr.hasNext())
            {
               CallbackHandlerHolder holder = (CallbackHandlerHolder)itr.next();
  -            if(holder.getHandler().equals(callbackhandler) && holder.getLocator().equals(locator))
  +            InvokerCallbackHandler holderhandler = holder.getHandler();
  +            boolean handlersEqual = holderhandler.equals(callbackhandler);
  +            InvokerLocator handlerLocator = holder.getLocator();
  +            boolean locatorsEqual = handlerLocator.equals(locator);
  +            if(handlersEqual && locatorsEqual)
               {
                  // the entry already exists for this pair, so return null
                  return null;
  @@ -176,9 +180,13 @@
                  Map.Entry entry = (Map.Entry)itr.next();
                  String listenerId = (String)entry.getKey();
                  CallbackHandlerHolder holder = (CallbackHandlerHolder)entry.getValue();
  +               InvokerCallbackHandler holderHandler = holder.getHandler();
  +               if(holderHandler.equals(handler))
  +               {
                  CallbackLocatorHolder locatorHolder = new CallbackLocatorHolder(listenerId, holder.getLocator());
                  holderList.add(locatorHolder);
               }
  +            }
               // now remove holders
               if(holderList.size() > 0)
               {