[jboss-cvs] JBossRemoting/src/tests/org/jboss/test/remoting/callback/acknowledge ...

[Ron Sigal]

  User: rsigal  
  Date: 06/11/21 02:01:37

  Modified:    src/tests/org/jboss/test/remoting/callback/acknowledge  Tag:
                        remoting_2_x CallbackAcknowledgeTestCase.java
  Log:
  JBREM-605: Changed reliance of CallbackHandler on presence of REMOTING_ACKNOWLEDGES_PUSH_CALLBACKS in Callback ReturnPayload.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.2.2.4   +9 -3      JBossRemoting/src/tests/org/jboss/test/remoting/callback/acknowledge/CallbackAcknowledgeTestCase.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: CallbackAcknowledgeTestCase.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/tests/org/jboss/test/remoting/callback/acknowledge/CallbackAcknowledgeTestCase.java,v
  retrieving revision 1.2.2.3
  retrieving revision 1.2.2.4
  diff -u -b -r1.2.2.3 -r1.2.2.4
  --- CallbackAcknowledgeTestCase.java	16 Nov 2006 16:54:18 -0000	1.2.2.3
  +++ CallbackAcknowledgeTestCase.java	21 Nov 2006 07:01:37 -0000	1.2.2.4
  @@ -960,6 +960,10 @@
               {
                  returnPayload1.put(ServerInvokerCallbackHandler.REMOTING_ACKNOWLEDGES_PUSH_CALLBACKS, "true");
               }
  +            else
  +            {
  +               returnPayload1.put(APPLICATION_ACKNOWLEDGEMENT_TEST, "true");
  +            }
               callbackHandler.handleCallback(cb1);
   
               Callback cb2 = new Callback(command + "2");
  @@ -971,6 +975,10 @@
               {
                  returnPayload2.put(ServerInvokerCallbackHandler.REMOTING_ACKNOWLEDGES_PUSH_CALLBACKS, "true");
               }
  +            else
  +            {
  +               returnPayload2.put(APPLICATION_ACKNOWLEDGEMENT_TEST, "true");
  +            }
               callbackHandler.handleCallback(cb2);
            }
            return null;
  @@ -1020,9 +1028,7 @@
            callbacksReceived++;
   
            Map returnMap = callback.getReturnPayload();
  -         Object o = returnMap.get(ServerInvokerCallbackHandler.REMOTING_ACKNOWLEDGES_PUSH_CALLBACKS);
  -         if (o instanceof String  && Boolean.valueOf((String)o).booleanValue() ||
  -             o instanceof Boolean && ((Boolean)o).booleanValue())
  +         if (returnMap.get(APPLICATION_ACKNOWLEDGEMENT_TEST) == null)
               return;
   
            String test = (String) callback.getParameter();