[activemq-artemis] branch main updated: ARTEMIS-3677 add test, etc.

[jbertram]

This is an automated email from the ASF dual-hosted git repository.

jbertram pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git


The following commit(s) were added to refs/heads/main by this push:
     new 7b25cbb  ARTEMIS-3677 add test, etc.
7b25cbb is described below

commit 7b25cbb51da9310e7f4cd611c6bef949e50dd40a
Author: Justin Bertram <jbert...@apache.org>
AuthorDate: Thu Feb 10 11:25:20 2022 -0600

    ARTEMIS-3677 add test, etc.
---
 .../artemis/core/message/impl/CoreMessage.java       |  2 +-
 .../integration/management/QueueControlTest.java     | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/CoreMessage.java
 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/CoreMessage.java
index 48ea5fd..4b4a2cf 100644
--- 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/CoreMessage.java
+++ 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/CoreMessage.java
@@ -1410,7 +1410,7 @@ public class CoreMessage extends RefCountMessage 
implements ICoreMessage {
                rc.put(CompositeDataConstants.TEXT_BODY, "[compressed]");
             } else {
                SimpleString text = 
m.getReadOnlyBodyBuffer().readNullableSimpleString();
-               rc.put(CompositeDataConstants.TEXT_BODY, text != null ? 
JsonUtil.truncate(text.toString(), valueSizeLimit) : "");
+               rc.put(CompositeDataConstants.TEXT_BODY, JsonUtil.truncate(text 
!= null ? text.toString() : text, valueSizeLimit));
             }
          } else {
             rc.put(CompositeDataConstants.TEXT_BODY, "[large message]");
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java
index aa7c897..3ac730c 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java
@@ -3730,6 +3730,26 @@ public class QueueControlTest extends ManagementTestBase 
{
    }
 
    @Test
+   public void testBrowseWithNullPropertyValue() throws Exception {
+      SimpleString address = RandomUtil.randomSimpleString();
+      SimpleString queue = RandomUtil.randomSimpleString();
+
+      session.createQueue(new 
QueueConfiguration(queue).setAddress(address).setDurable(durable));
+
+      ClientProducer producer = session.createProducer(address);
+      ClientMessage m = session.createMessage(true);
+      m.putStringProperty(RandomUtil.randomString(), null);
+      producer.send(m);
+      producer.close();
+
+      QueueControl queueControl = createManagementControl(address, queue);
+
+      assertEquals(1, queueControl.browse().length);
+
+      session.deleteQueue(queue);
+   }
+
+   @Test
    public void testResetGroups() throws Exception {
       SimpleString address = RandomUtil.randomSimpleString();
       SimpleString queue = RandomUtil.randomSimpleString();