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

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

Author: ron_sigal
Date: 2006-10-20 18:30:36 -0400 (Fri, 20 Oct 2006)
New Revision: 1507

Modified:
   branches/Branch_HTTP_Experiment/src/main/org/jboss/jms/server/endpoint/ServerConsumerEndpoint.java
Log:
JBMESSAGING-207:  Deliverer puts callbackId in callback return payload map.

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-10-20 22:28:19 UTC (rev 1506)
+++ branches/Branch_HTTP_Experiment/src/main/org/jboss/jms/server/endpoint/ServerConsumerEndpoint.java	2006-10-20 22:30:36 UTC (rev 1507)
@@ -63,6 +63,7 @@
 import org.jboss.remoting.callback.Callback;
 import org.jboss.remoting.callback.CallbackListener;
 import org.jboss.remoting.callback.ServerInvokerCallbackHandler;
+import org.jboss.util.id.GUID;
 
 import EDU.oswego.cs.dl.util.concurrent.Executor;
 import EDU.oswego.cs.dl.util.concurrent.QueuedExecutor;
@@ -777,12 +778,14 @@
             Map metadata = new HashMap();
             metadata.put(ServerInvokerCallbackHandler.CALLBACK_POSTPROCESS_LISTENER,
                          ServerConsumerEndpoint.this);
+            String callbackId = new GUID().toString();
+            metadata.put(ServerInvokerCallbackHandler.CALLBACK_ID, callbackId);
             Callback callback = new Callback(mm);
             callback.setReturnPayload(metadata);
             
             synchronized (pendingCallbacks)
             {
-               pendingCallbacks.add(callback);
+               pendingCallbacks.add(callbackId);
             }
             
             connection.getCallbackHandler().handleCallback(callback);
@@ -897,13 +900,13 @@
    /**
     * To implement org.jboss.remoting.callback.CallbackListener
     */
-   public void callbackSent(Callback callback)
+   public void callbackSent(String callbackId)
    {  
-      System.out.println("entering callbackSent(): " + callback);
+      System.out.println("entering callbackSent(): " + callbackId);
       synchronized (pendingCallbacks)
       {
-         if (!pendingCallbacks.remove(callback))
-            log.warn("callbackSent() received unknown Callback: " + callback);
+         if (!pendingCallbacks.remove(callbackId))
+            log.warn("callbackSent() received unknown CallbackId: " + callbackId);
          
          if (pendingCallbacks.isEmpty())
             pendingCallbacks.notify();