[activemq-artemis] branch master updated: ARTEMIS-3137 Fixing Test with wrong message type on Xpath and Core

[clebertsuconic]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new f49a163  ARTEMIS-3137 Fixing Test with wrong message type on Xpath and 
Core
f49a163 is described below

commit f49a16342715c3e1ffe9c44c90200bd61aa31265
Author: Clebert Suconic <clebertsuco...@apache.org>
AuthorDate: Wed Mar 10 21:44:07 2021 -0500

    ARTEMIS-3137 Fixing Test with wrong message type on Xpath and Core
---
 .../main/java/org/apache/activemq/artemis/api/core/ICoreMessage.java | 4 ++--
 .../src/main/java/org/apache/activemq/artemis/api/core/Message.java  | 2 ++
 .../org/apache/activemq/artemis/api/core/client/ClientMessage.java   | 1 +
 .../org/apache/activemq/artemis/core/message/impl/CoreMessage.java   | 2 +-
 .../activemq/artemis/tests/integration/client/ConsumerTest.java      | 5 ++++-
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/ICoreMessage.java
 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/ICoreMessage.java
index b9bcc22..d367985 100644
--- 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/ICoreMessage.java
+++ 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/ICoreMessage.java
@@ -73,8 +73,8 @@ public interface ICoreMessage extends Message {
    boolean isServerMessage();
 
    /**
-    * The body used for this message.
-    *
+    * The buffer to write the body.
+    * Warning: If you just want to read the content of a message, use 
getDataBuffer() or getReadOnlyBuffer();
     * @return
     */
    @Override
diff --git 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java
 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java
index e20a660..2493747 100644
--- 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java
+++ 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java
@@ -223,6 +223,8 @@ public interface Message {
 
    /**
     * @deprecated do not use this, use through ICoreMessage or ClientMessage
+    * Warning: if you need to read the content of a message use 
getDataBuffer(). This method is intended for when you
+    *          want to make changes.
     */
    @Deprecated
    default ActiveMQBuffer getBodyBuffer() {
diff --git 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientMessage.java
 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientMessage.java
index 67f2150..1af7d91 100644
--- 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientMessage.java
+++ 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientMessage.java
@@ -132,6 +132,7 @@ public interface ClientMessage extends ICoreMessage {
 
    /**
     * The buffer to write the body.
+    * Warning: If you just want to read the content of a message, use 
getDataBuffer() or getReadOnlyBuffer();
     * @return
     */
    @Override
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 ee5eb60..7f25f04 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
@@ -1283,7 +1283,7 @@ public class CoreMessage extends RefCountMessage 
implements ICoreMessage {
                body = simpleBody.toString();
             }
          } catch (Exception e) {
-            // ignore
+            e.printStackTrace();
          }
       }
 
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerTest.java
index 482eeab..6b558a5 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerTest.java
@@ -1286,15 +1286,18 @@ public class ConsumerTest extends ActiveMQTestBase {
       ClientProducer producer = session.createProducer(QUEUE);
 
       ClientMessage message = session.createMessage(false);
+      message.setType(Message.TEXT_TYPE);
       
message.getBodyBuffer().writeNullableSimpleString(SimpleString.toSimpleString("wrong"));
       producer.send(message);
       message = session.createMessage(false);
+      message.setType(Message.TEXT_TYPE);
       message.getBodyBuffer().writeNullableSimpleString(BODY);
       producer.send(message);
 
       ClientConsumer consumer = session.createConsumer(QUEUE.toString(), 
"XPATH 'root/a'");
       session.start();
-      ClientMessage message2 = consumer.receive(1000);
+      ClientMessage message2 = consumer.receive(5000);
+      Assert.assertNotNull(message2);
 
       Assert.assertEquals(BODY, 
message2.getBodyBuffer().readNullableSimpleString());
       Assert.assertEquals(1, getMessageCount(((Queue) 
server.getPostOffice().getBinding(QUEUE).getBindable())));