eliminated NPE possibility in QueueImpl class

2016-02-09 13:46:49 +01:00 · 2016-02-09 13:46:49 +01:00 · b8dd0219a3
parent e0f5cb6eee
commit b8dd0219a3
1 changed files with 3 additions and 1 deletions
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
@ -2603,7 +2603,9 @@ public class QueueImpl implements Queue {
         message = null;
      }

-      boolean durableRef = message != null && message.isDurable() && queue.durable;
+      if (message == null) return;
+
+      boolean durableRef = message.isDurable() && queue.durable;

      try {
         message.decrementRefCount();