svn commit: r1772376 - in /qpid/java/trunk: client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_8.java systests/src/test/java/org/apache/qpid/test/unit/message/JMSHeaderTest.java

[kw...@apache.org]

Author: kwall
Date: Fri Dec  2 17:04:22 2016
New Revision: 1772376

URL: http://svn.apache.org/viewvc?rev=1772376&view=rev
Log:
QPID-7544: [Java Client] [0-9] Message resent after setDisableMessageID(true) should not have a JMSMessageID

Added:
    qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/message/JMSHeaderTest.java
Modified:
    qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_8.java

Modified: qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_8.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_8.java?rev=1772376&r1=1772375&r2=1772376&view=diff
==============================================================================
--- qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_8.java (original)
+++ qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_8.java Fri Dec  2 17:04:22 2016
@@ -173,7 +173,11 @@ public class AMQMessageDelegate_0_8 exte
 
     public void setJMSMessageID(UUID messageId) throws JMSException
     {
-        if (messageId != null)
+        if (messageId == null)
+        {
+            getContentHeaderProperties().setMessageId((String)null);
+        }
+        else
         {
             getContentHeaderProperties().setMessageId(asShortStringMsgId(messageId));
         }

Added: qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/message/JMSHeaderTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/message/JMSHeaderTest.java?rev=1772376&view=auto
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/message/JMSHeaderTest.java (added)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/message/JMSHeaderTest.java Fri Dec  2 17:04:22 2016
@@ -0,0 +1,59 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.qpid.test.unit.message;
+
+import javax.jms.Connection;
+import javax.jms.Message;
+import javax.jms.MessageProducer;
+import javax.jms.Queue;
+import javax.jms.Session;
+
+import org.apache.qpid.test.utils.QpidBrokerTestCase;
+
+public class JMSHeaderTest extends QpidBrokerTestCase
+{
+
+    public void testResentJMSMessageGetsReplacementJMSMessageID() throws Exception
+    {
+        Connection con = getConnection();
+        con.start();
+        Session session = con.createSession(false, Session.AUTO_ACKNOWLEDGE);
+
+        Queue queue = createTestQueue(session);
+
+        MessageProducer producer = session.createProducer(queue);
+
+        final Message sentMessage = session.createMessage();
+        producer.send(sentMessage);
+
+        final String originalId = sentMessage.getJMSMessageID();
+        assertNotNull("JMSMessageID must be set after first publish", originalId);
+
+        producer.send(sentMessage);
+        final String firstResendID = sentMessage.getJMSMessageID();
+        assertNotNull("JMSMessageID must be set after first resend", firstResendID);
+        assertNotSame("JMSMessageID must be changed second publish", originalId, firstResendID);
+
+        producer.setDisableMessageID(true);
+        producer.send(sentMessage);
+        final String secondResendID = sentMessage.getJMSMessageID();
+        assertNull("JMSMessageID must be unset after second resend with IDs disabled", secondResendID);
+    }
+}



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org