Author: ritchiem
Date: Mon Mar 3 08:28:36 2008
New Revision: 633160
URL: http://svn.apache.org/viewvc?rev=633160&view=rev
Log:
QPID-784 : Minor changes based on code comments by ASkinner and RGodfrey.
Modified:
incubator/qpid/branches/M2.1/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java
incubator/qpid/branches/M2.1/java/client/src/test/java/org/apache/qpid/test/unit/client/connectionurl/ConnectionURLTest.java
Modified:
incubator/qpid/branches/M2.1/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java?rev=633160&r1=633159&r2=633160&view=diff
==============================================================================
---
incubator/qpid/branches/M2.1/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java
(original)
+++
incubator/qpid/branches/M2.1/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java
Mon Mar 3 08:28:36 2008
@@ -57,9 +57,9 @@
if (transport != null)
{
//todo this list of valid transports should be enumerated
somewhere
- if ((!(transport.equalsIgnoreCase("vm") ||
- transport.equalsIgnoreCase("tcp") ||
- transport.equalsIgnoreCase("socket"))))
+ if ((!(transport.equalsIgnoreCase(BrokerDetails.VM) ||
+ transport.equalsIgnoreCase(BrokerDetails.TCP) ||
+ transport.equalsIgnoreCase(BrokerDetails.SOCKET))))
{
if (transport.equalsIgnoreCase("localhost"))
{
Modified:
incubator/qpid/branches/M2.1/java/client/src/test/java/org/apache/qpid/test/unit/client/connectionurl/ConnectionURLTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/client/src/test/java/org/apache/qpid/test/unit/client/connectionurl/ConnectionURLTest.java?rev=633160&r1=633159&r2=633160&view=diff
==============================================================================
---
incubator/qpid/branches/M2.1/java/client/src/test/java/org/apache/qpid/test/unit/client/connectionurl/ConnectionURLTest.java
(original)
+++
incubator/qpid/branches/M2.1/java/client/src/test/java/org/apache/qpid/test/unit/client/connectionurl/ConnectionURLTest.java
Mon Mar 3 08:28:36 2008
@@ -512,7 +512,7 @@
public void testSocketProtocol() throws URLSyntaxException
{
- String url = "amqp://guest:[EMAIL PROTECTED]/test" +
"?brokerlist='socket:///'";
+ String url = "amqp://guest:[EMAIL PROTECTED]/test" +
"?brokerlist='socket://VM-Unique-socketID'";
try
{
@@ -520,7 +520,9 @@
assertNotNull(curl);
assertEquals(1, curl.getBrokerCount());
assertNotNull(curl.getBrokerDetails(0));
- assertEquals("socket", curl.getBrokerDetails(0).getTransport());
+ assertEquals(BrokerDetails.SOCKET,
curl.getBrokerDetails(0).getTransport());
+ assertEquals("VM-Unique-socketID",
curl.getBrokerDetails(0).getHost());
+ assertEquals("URL does not toString as expected", url,
curl.toString());
}
catch (URLSyntaxException e)
{
