[jboss-cvs] JBoss Messaging SVN: r7488 - in branches/Branch_1_4: tests/src/org/jboss/test/messaging/jms/message and 1 other directory.

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

Author: gaohoward
Date: 2009-06-29 04:32:01 -0400 (Mon, 29 Jun 2009)
New Revision: 7488

Modified:
   branches/Branch_1_4/src/main/org/jboss/jms/message/JBossMessage.java
   branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/message/MessageHeaderTest.java
Log:
JBMESSAGING-1617


Modified: branches/Branch_1_4/src/main/org/jboss/jms/message/JBossMessage.java
===================================================================
--- branches/Branch_1_4/src/main/org/jboss/jms/message/JBossMessage.java	2009-06-28 04:33:44 UTC (rev 7487)
+++ branches/Branch_1_4/src/main/org/jboss/jms/message/JBossMessage.java	2009-06-29 08:32:01 UTC (rev 7488)
@@ -339,20 +339,12 @@
 
       setJMSTimestamp(foreign.getJMSTimestamp());
 
-      try
+      //https://jira.jboss.org/jira/browse/JBMESSAGING-1617
+      String corrIDString = foreign.getJMSCorrelationID();
+      if (corrIDString != null)
       {
-         byte[] corrIDBytes = foreign.getJMSCorrelationIDAsBytes();
-         setJMSCorrelationIDAsBytes(corrIDBytes);
+         setJMSCorrelationID(corrIDString);
       }
-      catch(JMSException e)
-      {
-         // specified as String
-         String corrIDString = foreign.getJMSCorrelationID();
-         if (corrIDString != null)
-         {
-            setJMSCorrelationID(corrIDString);
-         }
-      }
       
       setJMSReplyTo(foreign.getJMSReplyTo());
       setJMSDestination(foreign.getJMSDestination());

Modified: branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/message/MessageHeaderTest.java
===================================================================
--- branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/message/MessageHeaderTest.java	2009-06-28 04:33:44 UTC (rev 7487)
+++ branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/message/MessageHeaderTest.java	2009-06-29 08:32:01 UTC (rev 7488)
@@ -863,6 +863,16 @@
       ensureEquivalent(foreignMessage, copy);
    }
 
+   public void testCopyForeignCorrelationID() throws JMSException
+   {
+      Message foreignMessage = new SimpleJMSMessage();
+      foreignMessage.setJMSCorrelationID("ID:test-string-id");
+
+      JBossMessage copy = new JBossMessage(foreignMessage, 0);
+
+      assertEquals(foreignMessage.getJMSCorrelationID(), copy.getJMSCorrelationID());
+   }
+
    // Package protected ---------------------------------------------
 
    // Protected -----------------------------------------------------