Author: dejanb Date: Tue Mar 15 09:39:47 2011 New Revision: 1081697 URL: http://svn.apache.org/viewvc?rev=1081697&view=rev Log: https://issues.apache.org/jira/browse/AMQ-3204 - adding additional null check Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/util/DestinationPathSeparatorBroker.java Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/util/DestinationPathSeparatorBroker.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/util/DestinationPathSeparatorBroker.java?rev=1081697&r1=1081696&r2=1081697&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/util/DestinationPathSeparatorBroker.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/util/DestinationPathSeparatorBroker.java Tue Mar 15 09:39:47 2011 @@ -39,7 +39,7 @@ public class DestinationPathSeparatorBro String pathSeparator = "/"; protected ActiveMQDestination convertDestination(ActiveMQDestination destination) { - if (destination.getPhysicalName().contains(pathSeparator)) { + if (destination != null && destination.getPhysicalName().contains(pathSeparator)) { List l = new ArrayList(); StringTokenizer iter = new StringTokenizer(destination.getPhysicalName(), pathSeparator); while (iter.hasMoreTokens()) {