From 555dd31f60bacbfaf15cb559c8991c1e50618367 Mon Sep 17 00:00:00 2001
From: Stanislav Knot <sknot@redhat.com>
Date: Tue, 13 Mar 2018 12:19:01 +0100
Subject: [PATCH] ARTEMIS-1743 fix NPE in server log when Artemis trace logging
 is enabled

---
 .../activemq/artemis/core/message/impl/CoreMessage.java      | 5 ++++-
 1 file changed, 4 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 2c570b9a245..5ed46cdd41c 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
@@ -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