[jboss-cvs] JBoss Messaging SVN: r3093 - in trunk: tests/src/org/jboss/test/messaging/jms/clustering and 1 other directory.

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

Author: clebert.suconic at jboss.com
Date: 2007-09-10 18:36:25 -0400 (Mon, 10 Sep 2007)
New Revision: 3093

Modified:
   trunk/src/main/org/jboss/jms/client/container/ProducerAspect.java
   trunk/tests/src/org/jboss/test/messaging/jms/clustering/DistributedQueueTestBase.java
Log:
http://jira.jboss.org/jira/browse/JBMESSAGING-1063

Modified: trunk/src/main/org/jboss/jms/client/container/ProducerAspect.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/container/ProducerAspect.java	2007-09-10 21:42:30 UTC (rev 3092)
+++ trunk/src/main/org/jboss/jms/client/container/ProducerAspect.java	2007-09-10 22:36:25 UTC (rev 3093)
@@ -89,6 +89,13 @@
 
       boolean keepID = args.length>5? ((Boolean)args[5]).booleanValue() : false;
 
+      String correlatedMessage = null;
+
+      if (keepID)
+      {
+         correlatedMessage = m.getJMSMessageID();
+      }
+
       // configure the message for sending, using attributes stored as metadata
 
       ProducerState producerState = getProducerState(mi);
@@ -167,7 +174,8 @@
       // Generate the message id
       ConnectionState connectionState = (ConnectionState)sessionState.getParent();
       
-      long id = 0;
+      long id =
+         connectionState.getIdGenerator().getId((ConnectionDelegate)connectionState.getDelegate());
 
       JBossMessage messageToSend;
       boolean foreign = false;
@@ -217,12 +225,6 @@
          // get the actual message
          MessageProxy proxy = (MessageProxy)m;
 
-         if (keepID)
-         {
-            id = ((MessageProxy)m).getMessage().getMessageID();
-         }
-
-         
          m.setJMSDestination(destination);
                                     
          //The following line executed on the proxy should cause a copy to occur
@@ -237,12 +239,12 @@
           
       // Set the new id
       
-      if (!keepID && id == 0l)
+      messageToSend.setMessageId(id);
+
+      if (correlatedMessage != null)
       {
-         id = connectionState.getIdGenerator().getId((ConnectionDelegate)connectionState.getDelegate());
+         messageToSend.setJMSCorrelationID(correlatedMessage);
       }
-
-      messageToSend.setMessageId(id);
       
       // This only really used for BytesMessages and StreamMessages to reset their state
       messageToSend.doBeforeSend(); 

Modified: trunk/tests/src/org/jboss/test/messaging/jms/clustering/DistributedQueueTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/clustering/DistributedQueueTestBase.java	2007-09-10 21:42:30 UTC (rev 3092)
+++ trunk/tests/src/org/jboss/test/messaging/jms/clustering/DistributedQueueTestBase.java	2007-09-10 22:36:25 UTC (rev 3093)
@@ -560,8 +560,8 @@
          {
             TextMessage tm = (TextMessage)cons2.receive(1000);
 
-            assertEquals(messageIdCorrelate[i], tm.getJMSMessageID());
             assertNotNull(tm);
+            assertEquals(messageIdCorrelate[i], tm.getJMSCorrelationID());
             
             assertEquals("message3-" + i, tm.getText());
          }