ACTIVEMQ6-14 - fix for removal of bindings https://issues.apache.org/jira/browse/ACTIVEMQ6-14
the jms server manager code was throwing a npe because of this, this commit addresses that. Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/0123d40c Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/0123d40c Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/0123d40c Branch: refs/heads/master Commit: 0123d40c43c398dcb8fb0d2e8a23627860f9135e Parents: 0818587 Author: Andy Taylor <[email protected]> Authored: Fri Jan 16 11:12:47 2015 +0000 Committer: Andy Taylor <[email protected]> Committed: Fri Jan 16 11:12:47 2015 +0000 ---------------------------------------------------------------------- .../activemq/jms/server/impl/JMSServerManagerImpl.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-6/blob/0123d40c/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerManagerImpl.java ---------------------------------------------------------------------- diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerManagerImpl.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerManagerImpl.java index 020dd36..8edcde4 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerManagerImpl.java +++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerManagerImpl.java @@ -593,11 +593,14 @@ public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback ArrayList<String> bindingsToAdd = new ArrayList<String>(); - for (String bindingsItem : bindings) + if (bindings != null) { - if (bindToBindings(bindingsItem, destination)) + for (String bindingsItem : bindings) { - bindingsToAdd.add(bindingsItem); + if (bindToBindings(bindingsItem, destination)) + { + bindingsToAdd.add(bindingsItem); + } } }
