ARTEMIS-4209 avoid double 'ID:' for 'User ID' when browsing AMQP msgs

apache · Mar 28, 2023 · 448a6de · 448a6de
1 parent d2e5ddf
commit 448a6de
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/.../main/java/org/apache/activemq/artemis/core/message/openmbean/MessageOpenTypeFactory.java b/.../main/java/org/apache/activemq/artemis/core/message/openmbean/MessageOpenTypeFactory.java
@@ -127,7 +127,8 @@ public Map<String, Object> getFields(M m, int valueSizeLimit, int deliveryCount)
       rc.put(CompositeDataConstants.MESSAGE_ID, "" + m.getMessageID());
       rc.put(CompositeDataConstants.PROTOCOL, m.getProtocolName());
       if (m.getUserID() != null) {
-         rc.put(CompositeDataConstants.USER_ID, "ID:" + m.getUserID().toString());
+         String userID = m.getUserID().toString();
+         rc.put(CompositeDataConstants.USER_ID, userID.startsWith("ID:") ? userID : "ID:" + userID);
       } else {
          rc.put(CompositeDataConstants.USER_ID, "");
       }

diff --git a/.../test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java b/.../test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java
@@ -4090,12 +4090,24 @@ public void testSendMessageWithAMQP() throws Exception {
 
       Assert.assertEquals(2, browse.length);
 
+      String userID = (String) browse[0].get("userID");
+
+      Assert.assertTrue(userID.startsWith("ID:"));
+
+      Assert.assertFalse(userID.startsWith("ID:ID:"));
+
       String body = (String) browse[0].get("text");
 
       Assert.assertNotNull(body);
 
       Assert.assertEquals("theAMQPBody", body);
 
+      userID = (String) browse[1].get("userID");
+
+      Assert.assertTrue(userID.startsWith("ID:"));
+
+      Assert.assertFalse(userID.startsWith("ID:ID:"));
+
       body = (String) browse[1].get("text");
 
       Assert.assertNotNull(body);