You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by gt...@apache.org on 2010/02/18 15:26:45 UTC
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
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);