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

[Ron Sigal]

  User: rsigal  
  Date: 06/10/11 18:39:53

  Modified:    src/main/org/jboss/remoting/callback 
                        ServerInvokerCallbackHandler.java
  Log:
  JBREM-605:  (1) Moved call to checkForPullPostprocessListener() to before callback is persisted. (2) Removed unused method checkForPushPostprocessListener(). 
  
  Revision  Changes    Path
  1.14      +2 -15     JBossRemoting/src/main/org/jboss/remoting/callback/ServerInvokerCallbackHandler.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ServerInvokerCallbackHandler.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/callback/ServerInvokerCallbackHandler.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -b -r1.13 -r1.14
  --- ServerInvokerCallbackHandler.java	25 Sep 2006 23:34:47 -0000	1.13
  +++ ServerInvokerCallbackHandler.java	11 Oct 2006 22:39:53 -0000	1.14
  @@ -581,6 +581,8 @@
         {
            if(callBackClient == null)
            {
  +            checkForPullPostprocessListener(callback);
  + 
               // need to check if shoudl persist callback instead of keeping in memory
               if(shouldPersist())
               {
  @@ -614,8 +616,6 @@
                     callbacks.add(callback);
                  }
               }
  -            
  -            checkForPullPostprocessListener(callback);
            }
            else
            {
  @@ -729,19 +729,6 @@
         }
      }
      
  -   private void checkForPushPostprocessListener(Callback callback)
  -   {
  -      Map returnPayload = callback.getReturnPayload();
  -      if (returnPayload != null)
  -      {
  -         CallbackListener listener = (CallbackListener) returnPayload.remove(CALLBACK_POSTPROCESS_LISTENER);
  -         if (listener != null)
  -         {
  -            listener.callbackSent(callback);
  -         }
  -      }
  -   }
  -   
      /**
       * Calls a postprocess listener
       * @param callbackId identity of Callback to acknowledge