Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 24059 invoked from network); 18 Feb 2010 14:27:06 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 18 Feb 2010 14:27:06 -0000 Received: (qmail 55971 invoked by uid 500); 18 Feb 2010 14:27:06 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 55914 invoked by uid 500); 18 Feb 2010 14:27:06 -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 55905 invoked by uid 99); 18 Feb 2010 14:27:06 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Feb 2010 14:27:06 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Thu, 18 Feb 2010 14:27:05 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 539222388905; Thu, 18 Feb 2010 14:26:45 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r911417 - in /activemq/branches/activemq-5.3/activemq-core/src: main/java/org/apache/activemq/transport/vm/VMTransportFactory.java test/java/org/apache/activemq/transport/vm/VMTransportBrokerNameTest.java Date: Thu, 18 Feb 2010 14:26:45 -0000 To: commits@activemq.apache.org From: gtully@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100218142645.539222388905@eris.apache.org> Author: gtully Date: Thu Feb 18 14:26:44 2010 New Revision: 911417 URL: http://svn.apache.org/viewvc?rev=911417&view=rev Log: merge -r910315 https://svn.apache.org/repos/asf/activemq/trunk - resolve https://issues.apache.org/activemq/browse/AMQ-2607 Added: activemq/branches/activemq-5.3/activemq-core/src/test/java/org/apache/activemq/transport/vm/VMTransportBrokerNameTest.java - copied unchanged from r910315, activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/vm/VMTransportBrokerNameTest.java Modified: activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/transport/vm/VMTransportFactory.java Modified: activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/transport/vm/VMTransportFactory.java URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/transport/vm/VMTransportFactory.java?rev=911417&r1=911416&r2=911417&view=diff ============================================================================== --- activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/transport/vm/VMTransportFactory.java (original) +++ activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/transport/vm/VMTransportFactory.java Thu Feb 18 14:26:44 2010 @@ -68,7 +68,7 @@ host = "localhost"; } if (brokerData.getPath() != null) { - host = data.getPath(); + host = brokerData.getPath(); } options = data.getParameters(); location = new URI("vm://" + host);