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

[Ron Sigal]

  User: rsigal  
  Date: 06/09/25 19:43:47

  Modified:    src/main/org/jboss/remoting/callback  CallbackPoller.java
  Log:
  JBREM-605: Wll acknowledge pushing Callback if requested.
  
  Revision  Changes    Path
  1.3       +23 -0     JBossRemoting/src/main/org/jboss/remoting/callback/CallbackPoller.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: CallbackPoller.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/callback/CallbackPoller.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- CallbackPoller.java	19 May 2006 02:05:59 -0000	1.2
  +++ CallbackPoller.java	25 Sep 2006 23:43:47 -0000	1.3
  @@ -23,6 +23,7 @@
   
   import org.jboss.logging.Logger;
   import org.jboss.remoting.Client;
  +import org.jboss.remoting.invocation.InternalInvocation;
   import org.jboss.remoting.util.TimerUtil;
   
   import java.util.List;
  @@ -125,6 +126,14 @@
                        try
                        {
                           callbackHandler.handleCallback(callbackObject);
  +                        try
  +                        {
  +                           checkForAcknowledgementRequest(callbackHandler, callbackObject);
  +                        }
  +                        catch (Throwable t)
  +                        {
  +                           log.error("Error acknowledging callback to callback handler (" + callbackHandler + ").", t);
  +                        }
                        }
                        catch (HandleCallbackException e)
                        {
  @@ -150,4 +159,18 @@
         callbackHandler = null;
         callbackHandlerObject = null;
      }
  +   
  +   private void checkForAcknowledgementRequest(InvokerCallbackHandler callbackhandler, Callback callback)
  +   throws Throwable
  +   {
  +      Map returnPayload = callback.getReturnPayload();
  +      if (returnPayload != null)
  +      {
  +         Object callbackId = returnPayload.get(ServerInvokerCallbackHandler.CALLBACK_ID);
  +         if (callbackId != null)
  +         {
  +            client.acknowledgeCallback(callbackHandler, callback);
  +         }
  +      }
  +   }
   }
  \ No newline at end of file