[jboss-cvs] JBoss Messaging SVN: r1599 - branches/Branch_HTTP_Experiment/src/main/org/jboss/jms/server/endpoint

[jboss-cvs-commits at lists.jboss.org]

Author: ron_sigal
Date: 2006-11-20 23:55:50 -0500 (Mon, 20 Nov 2006)
New Revision: 1599

Modified:
   branches/Branch_HTTP_Experiment/src/main/org/jboss/jms/server/endpoint/ServerConsumerEndpoint.java
Log:
JBMESSAGING-207:  Added request for Remoting to handler callback acknowledgements, and changed to conform to CallbackListener interface changes.

Modified: branches/Branch_HTTP_Experiment/src/main/org/jboss/jms/server/endpoint/ServerConsumerEndpoint.java
===================================================================
--- branches/Branch_HTTP_Experiment/src/main/org/jboss/jms/server/endpoint/ServerConsumerEndpoint.java	2006-11-21 03:22:44 UTC (rev 1598)
+++ branches/Branch_HTTP_Experiment/src/main/org/jboss/jms/server/endpoint/ServerConsumerEndpoint.java	2006-11-21 04:55:50 UTC (rev 1599)
@@ -62,6 +62,7 @@
 import org.jboss.messaging.util.Future;
 import org.jboss.remoting.callback.Callback;
 import org.jboss.remoting.callback.CallbackListener;
+import org.jboss.remoting.callback.InvokerCallbackHandler;
 import org.jboss.remoting.callback.ServerInvokerCallbackHandler;
 import org.jboss.util.id.GUID;
 
@@ -775,10 +776,10 @@
             MessagingMarshallable mm = new MessagingMarshallable(connection.getUsingVersion(), del);
 
             Map metadata = new HashMap();
-            metadata.put(ServerInvokerCallbackHandler.CALLBACK_POSTPROCESS_LISTENER,
-                         ServerConsumerEndpoint.this);
+            metadata.put(ServerInvokerCallbackHandler.CALLBACK_LISTENER, ServerConsumerEndpoint.this);
             String callbackId = new GUID().toString();
             metadata.put(ServerInvokerCallbackHandler.CALLBACK_ID, callbackId);
+            metadata.put(ServerInvokerCallbackHandler.REMOTING_ACKNOWLEDGES_PUSH_CALLBACKS, "true");
             Callback callback = new Callback(mm);
             callback.setReturnPayload(metadata);
             
@@ -899,7 +900,7 @@
    /**
     * To implement org.jboss.remoting.callback.CallbackListener
     */
-   public void callbackSent(Object callbackId, int ignore)
+   public void acknowledgeCallback(InvokerCallbackHandler callbackHandler, Object callbackId, Object response)
    {
       synchronized (pendingCallbacks)
       {