QPID-255 : Patch Supplied by Rob Godfrey - Change to use bespoke AMQShortString rather than converting to String

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@494121 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 5 insertions, 3 deletions

diff --git a/qpid/java/cluster/src/test/java/org/apache/qpid/server/cluster/ClusterCapabilityTest.java b/qpid/java/cluster/src/test/java/org/apache/qpid/server/cluster/ClusterCapabilityTest.java
index 76b1da8754..830a00f4c2 100644
--- a/qpid/java/cluster/src/test/java/org/apache/qpid/server/cluster/ClusterCapabilityTest.java
+++ b/qpid/java/cluster/src/test/java/org/apache/qpid/server/cluster/ClusterCapabilityTest.java
@@ -21,13 +21,14 @@
 package org.apache.qpid.server.cluster;
 
 import junit.framework.TestCase;
+import org.apache.qpid.framing.AMQShortString;
 
 public class ClusterCapabilityTest extends TestCase
 {
     public void testStartWithNull()
     {
         MemberHandle peer = new SimpleMemberHandle("myhost:9999");
-        String c = ClusterCapability.add(null, peer);
+        AMQShortString c = ClusterCapability.add(null, peer);
         assertTrue(ClusterCapability.contains(c));
         assertTrue(peer.matches(ClusterCapability.getPeer(c)));
     }
@@ -35,7 +36,7 @@ public class ClusterCapabilityTest extends TestCase
     public void testStartWithText()
     {
         MemberHandle peer = new SimpleMemberHandle("myhost:9999");
-        String c = ClusterCapability.add("existing text", peer);
+        AMQShortString c = ClusterCapability.add(new AMQShortString("existing text"), peer);
         assertTrue(ClusterCapability.contains(c));
         assertTrue(peer.matches(ClusterCapability.getPeer(c)));
     }
diff --git a/qpid/java/cluster/src/test/java/org/apache/qpid/server/cluster/SimpleClusterTest.java b/qpid/java/cluster/src/test/java/org/apache/qpid/server/cluster/SimpleClusterTest.java
index c427285f4a..70209cd2a3 100644
--- a/qpid/java/cluster/src/test/java/org/apache/qpid/server/cluster/SimpleClusterTest.java
+++ b/qpid/java/cluster/src/test/java/org/apache/qpid/server/cluster/SimpleClusterTest.java
@@ -21,6 +21,7 @@
 package org.apache.qpid.server.cluster;
 
 import org.apache.qpid.AMQException;
+import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.url.URLSyntaxException;
 import org.apache.qpid.client.AMQConnection;
 import org.apache.qpid.client.AMQSession;
@@ -36,7 +37,7 @@ public class SimpleClusterTest extends TestCase
         AMQConnection con = new AMQConnection("localhost:9000", "guest", "guest", "test", "/test");
         AMQSession session = (AMQSession) con.createSession(false, AMQSession.NO_ACKNOWLEDGE);
         System.out.println("Session created");
-        session.declareExchange("my_exchange", "direct");
+        session.declareExchange(new AMQShortString("my_exchange"), new AMQShortString("direct"));
         System.out.println("Exchange declared");
         con.close();
         System.out.println("Connection closed");