Repository: activemq-artemis Updated Branches: refs/heads/1.x 466f5f8eb -> a90adaed5
[ARTEMIS-1670] NPE was found in when dropping durable subscriptions from a topic Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/3e212c09 Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/3e212c09 Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/3e212c09 Branch: refs/heads/1.x Commit: 3e212c09db04e22c76d443bede5ac00a2c86ba6a Parents: 466f5f8 Author: Lin Gao <[email protected]> Authored: Fri Feb 9 15:02:12 2018 +0800 Committer: Lin Gao <[email protected]> Committed: Fri Feb 9 15:02:12 2018 +0800 ---------------------------------------------------------------------- .../activemq/artemis/jms/server/impl/JMSServerManagerImpl.java | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3e212c09/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java ---------------------------------------------------------------------- diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java index 96004e9..4c18741 100644 --- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java +++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java @@ -1666,6 +1666,9 @@ public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback @Override public boolean delete(SimpleString queueName) throws Exception { Queue queue = server.locateQueue(queueName); + if (queue == null) { + return false; + } SimpleString address = queue.getAddress(); AddressSettings settings = server.getAddressSettingsRepository().getMatch(address.toString()); long consumerCount = queue.getConsumerCount();
