ARTEMIS-1874 fix NPE setting object property
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/4d492bea Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/4d492bea Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/4d492bea Branch: refs/heads/2.6.x Commit: 4d492bea0ee5fb00dcceca9366375cb87d32fe94 Parents: 6e6a76d Author: Justin Bertram <jbert...@apache.org> Authored: Mon May 21 09:55:15 2018 -0500 Committer: Clebert Suconic <clebertsuco...@apache.org> Committed: Mon May 21 18:10:00 2018 -0400 ---------------------------------------------------------------------- .../org/apache/activemq/artemis/jms/client/ActiveMQMessage.java | 2 +- .../artemis/tests/integration/jms/client/MessageTest.java | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4d492bea/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessage.java ---------------------------------------------------------------------- diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessage.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessage.java index 6e28c0e..18f8000 100644 --- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessage.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessage.java @@ -965,7 +965,7 @@ public class ActiveMQMessage implements javax.jms.Message { boolean result = false; if (jmsPropertyName.equals(name)) { - message.putStringProperty(corePropertyName, value.toString()); + message.putStringProperty(corePropertyName, value == null ? null : value.toString()); result = true; } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4d492bea/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/MessageTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/MessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/MessageTest.java index 29063f2..5641bbf 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/MessageTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/MessageTest.java @@ -26,6 +26,7 @@ import javax.jms.Session; import javax.jms.StreamMessage; import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient; +import org.apache.activemq.artemis.reader.MessageUtil; import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; import org.apache.activemq.artemis.tests.util.JMSTestBase; import org.junit.Assert; @@ -193,6 +194,10 @@ public class MessageTest extends JMSTestBase { msg.setObjectProperty(MessageTest.propName1, null); + msg.setObjectProperty(MessageUtil.JMSXGROUPID, null); + + msg.setObjectProperty(MessageUtil.JMSXUSERID, null); + msg.setStringProperty(MessageTest.propName2, null); msg.getStringProperty(MessageTest.propName1);
