From 6f1ba3faa339eb2365a264c942b974bdc1f643c7 Mon Sep 17 00:00:00 2001
From: Svyatoslav Sabirov <vaticorp@mail.ru>
Date: Mon, 19 Nov 2018 17:50:09 +0300
Subject: [PATCH] Update ServerSessionImpl.java

---
 .../activemq/artemis/core/server/impl/ServerSessionImpl.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java
index 8b102bdc9bf..940973747f9 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java
@@ -335,7 +335,9 @@ public boolean removeConsumer(final long consumerID) throws Exception {
    }
 
    protected void doClose(final boolean failed) throws Exception {
-      callback.close(failed);
+      if (callback != null) {
+          callback.close(failed);
+      }
       synchronized (this) {
          this.setStarted(false);
          if (closed)