activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject [2/2] activemq-artemis git commit: ARTEMIS-467 Potential NPE
Date Thu, 07 Apr 2016 14:52:09 GMT
ARTEMIS-467 Potential NPE


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/dbf0eced
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/dbf0eced
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/dbf0eced

Branch: refs/heads/master
Commit: dbf0eced4b451a59ac0cc3ccc2155d99fbae42ce
Parents: 87b6984
Author: jbertram <jbertram@apache.org>
Authored: Tue Apr 5 11:19:04 2016 -0500
Committer: Clebert Suconic <clebertsuconic@apache.org>
Committed: Thu Apr 7 10:51:59 2016 -0400

----------------------------------------------------------------------
 .../activemq/artemis/jms/server/impl/JMSServerManagerImpl.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/dbf0eced/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 d888a8c..8fe181a 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
@@ -1239,7 +1239,7 @@ public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback
       checkInitialised();
       List<String> registryBindings = connectionFactoryBindings.get(name);
 
-      if (registry != null) {
+      if (registry != null && registryBindings != null) {
          for (String registryBinding : registryBindings) {
             registry.unbind(registryBinding);
          }


Mime
View raw message