Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 69795 invoked from network); 15 Mar 2011 09:40:14 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 15 Mar 2011 09:40:14 -0000 Received: (qmail 26949 invoked by uid 500); 15 Mar 2011 09:40:14 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 26918 invoked by uid 500); 15 Mar 2011 09:40:13 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 26911 invoked by uid 99); 15 Mar 2011 09:40:13 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 15 Mar 2011 09:40:13 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 15 Mar 2011 09:40:11 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 8931F2388901; Tue, 15 Mar 2011 09:39:47 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1081697 - /activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/util/DestinationPathSeparatorBroker.java Date: Tue, 15 Mar 2011 09:39:47 -0000 To: commits@activemq.apache.org From: dejanb@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110315093947.8931F2388901@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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()) {