You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2018/09/28 18:52:47 UTC
activemq-artemis git commit: ARTEMIS-1874 fix NPE setting object
property
Repository: activemq-artemis
Updated Branches:
refs/heads/1.x c3fded0be -> 11ce7f864
ARTEMIS-1874 fix NPE setting object property
(cherry picked from commit 4d492bea0ee5fb00dcceca9366375cb87d32fe94)
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/11ce7f86
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/11ce7f86
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/11ce7f86
Branch: refs/heads/1.x
Commit: 11ce7f864e861c98eaa1b582195273cdde67d86b
Parents: c3fded0
Author: Justin Bertram <jb...@apache.org>
Authored: Mon May 21 09:55:15 2018 -0500
Committer: Romain Pelisse <be...@gmail.com>
Committed: Fri Sep 28 10:41:40 2018 +0200
----------------------------------------------------------------------
.../org/apache/activemq/artemis/jms/client/ActiveMQMessage.java | 3 +--
.../artemis/tests/integration/jms/client/MessageTest.java | 5 +++++
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/11ce7f86/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 12b1296..548a051 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
@@ -940,8 +940,7 @@ public class ActiveMQMessage implements javax.jms.Message {
boolean result = false;
if (jmsPropertyName.equals(name)) {
- message.putStringProperty(corePropertyName, SimpleString.toSimpleString(value.toString()));
-
+ message.putStringProperty(corePropertyName, value == null ? null : SimpleString.toSimpleString(value.toString()));
result = true;
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/11ce7f86/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);