Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AMQ-4045: Fixed NPE in BrokerService. 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1383856 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Claus Ibsen 2012-09-12 08:58:18 +00:00
parent 13222cd4a4
commit 5453b26eb8
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java
View File

@ -2515,12 +2515,14 @@ public class BrokerService implements Service {
// created at startup, so no sync needed // created at startup, so no sync needed
if (virtualConsumerDestinationFilter == null) { if (virtualConsumerDestinationFilter == null) {
Set <ActiveMQQueue> consumerDestinations = new HashSet<ActiveMQQueue>(); Set <ActiveMQQueue> consumerDestinations = new HashSet<ActiveMQQueue>();
for (DestinationInterceptor interceptor : destinationInterceptors) { if (destinationInterceptors != null) {
if (interceptor instanceof VirtualDestinationInterceptor) { for (DestinationInterceptor interceptor : destinationInterceptors) {
VirtualDestinationInterceptor virtualDestinationInterceptor = (VirtualDestinationInterceptor) interceptor; if (interceptor instanceof VirtualDestinationInterceptor) {
for (VirtualDestination virtualDestination: virtualDestinationInterceptor.getVirtualDestinations()) { VirtualDestinationInterceptor virtualDestinationInterceptor = (VirtualDestinationInterceptor) interceptor;
if (virtualDestination instanceof VirtualTopic) { for (VirtualDestination virtualDestination: virtualDestinationInterceptor.getVirtualDestinations()) {
consumerDestinations.add(new ActiveMQQueue(((VirtualTopic) virtualDestination).getPrefix() + DestinationFilter.ANY_DESCENDENT)); if (virtualDestination instanceof VirtualTopic) {
consumerDestinations.add(new ActiveMQQueue(((VirtualTopic) virtualDestination).getPrefix() + DestinationFilter.ANY_DESCENDENT));
}
} }
} }
} }