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 020dd368a9..8edcde4330 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 bindingsToAdd = new ArrayList(); - 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); + } } }