Author: rajdavies
Date: Tue Feb 14 03:31:56 2006
New Revision: 377701
URL: http://svn.apache.org/viewcvs?rev=377701&view=rev
Log:
getDurableDestinations() now returns empty set if the persistence adaptor is
null -
instead of throwing npe
Modified:
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/RegionBroker.java
Modified:
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/RegionBroker.java
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/RegionBroker.java?rev=377701&r1=377700&r2=377701&view=diff
==============================================================================
---
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/RegionBroker.java
(original)
+++
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/RegionBroker.java
Tue Feb 14 03:31:56 2006
@@ -50,6 +50,7 @@
import java.io.IOException;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
@@ -456,7 +457,7 @@
}
public Set getDurableDestinations(){
- return adaptor.getDestinations();
+ return adaptor != null ? adaptor.getDestinations() :
Collections.EMPTY_SET;
}