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

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

Author: ron_sigal
Date: 2006-11-21 00:01:12 -0500 (Tue, 21 Nov 2006)
New Revision: 1600

Modified:
   branches/Branch_HTTP_Experiment/src/main/org/jboss/jms/server/remoting/JMSWireFormat.java
Log:
JBMESSAGING-207:  Added handling for additional callback parameters: callback listener id and request for Remoting to handle callback acknowledgements.

Modified: branches/Branch_HTTP_Experiment/src/main/org/jboss/jms/server/remoting/JMSWireFormat.java
===================================================================
--- branches/Branch_HTTP_Experiment/src/main/org/jboss/jms/server/remoting/JMSWireFormat.java	2006-11-21 04:55:50 UTC (rev 1599)
+++ branches/Branch_HTTP_Experiment/src/main/org/jboss/jms/server/remoting/JMSWireFormat.java	2006-11-21 05:01:12 UTC (rev 1600)
@@ -49,6 +49,7 @@
 import org.jboss.logging.Logger;
 import org.jboss.messaging.core.message.MessageFactory;
 import org.jboss.messaging.core.plugin.IdBlock;
+import org.jboss.remoting.Client;
 import org.jboss.remoting.InvocationRequest;
 import org.jboss.remoting.InvocationResponse;
 import org.jboss.remoting.callback.Callback;
@@ -456,6 +457,10 @@
                   Map payload = callback.getReturnPayload();
                   String guid = (String)payload.get(ServerInvokerCallbackHandler.CALLBACK_ID);
                   dos.writeUTF(guid);
+                  String listenerId = (String)payload.get(Client.LISTENER_ID_KEY);
+                  dos.writeUTF(listenerId);
+                  String acks = (String)payload.get(ServerInvokerCallbackHandler.REMOTING_ACKNOWLEDGES_PUSH_CALLBACKS);
+                  dos.writeUTF(acks);
                   
                   MessagingMarshallable mm = (MessagingMarshallable) callback.getParameter();
                   ClientDelivery delivery = (ClientDelivery) mm.getLoad();
@@ -782,12 +787,16 @@
                for (int i = 0; i < size; i++)
                {
                   String guid = dis.readUTF();
+                  String listenerId = dis.readUTF();
+                  String acks = dis.readUTF();
                   ClientDelivery delivery = new ClientDelivery();
                   delivery.read(dis);
                   MessagingMarshallable mm = new MessagingMarshallable(version, delivery);
                   Callback callback = new Callback(mm);
                   HashMap payload = new HashMap();
                   payload.put(ServerInvokerCallbackHandler.CALLBACK_ID, guid);
+                  payload.put(Client.LISTENER_ID_KEY, listenerId);
+                  payload.put(ServerInvokerCallbackHandler.REMOTING_ACKNOWLEDGES_PUSH_CALLBACKS, acks);
                   callback.setReturnPayload(payload);
                   callbackList.add(callback);
                }