ARTEMIS-1743 fix NPE in server log when Artemis trace logging is enabled

apache · Mar 14, 2018 · 84a098a · 84a098a
1 parent a00245d
commit 84a098a
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/...-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/CoreMessage.java b/...-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/CoreMessage.java
@@ -644,8 +644,11 @@ public Message setLastValueProperty(SimpleString lastValueName) {
 
    @Override
    public int getEncodeSize() {
+      if (buffer == null) {
+         return -1;
+      }
       checkEncode();
-      return buffer == null ? -1 : buffer.writerIndex();
+      return buffer.writerIndex();
    }
 
    @Override