Changed the way temporary queues are created

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

2 files changed, 8 insertions, 4 deletions

diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/Client.java b/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/Client.java
index 445c6cf1a7..b2bf7fd7e4 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/Client.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/Client.java
@@ -31,6 +31,7 @@ import org.slf4j.LoggerFactory;
 
 import javax.jms.Message;
 import javax.jms.MessageListener;
+import javax.jms.MessageProducer;
 
 /**
  * Declare a private temporary response queue,
@@ -66,10 +67,12 @@ public class Client implements MessageListener
             new AMQQueue(_connection.getDefaultQueueExchangeName(), new AMQShortString("ResponseQueue"), true);
         _session.createConsumer(response).setMessageListener(this);
         _connection.start();
-        AMQQueue service = new SpecialQueue(_connection, "ServiceQueue");
+      //  AMQQueue service = new SpecialQueue(_connection, "ServiceQueue");
+        AMQQueue service  = (AMQQueue)  _session.createQueue("ServiceQueue") ;
         Message request = _session.createTextMessage("Request!");
         request.setJMSReplyTo(response);
-        _session.createProducer(service).send(request);
+        MessageProducer prod = _session.createProducer(service);
+        prod.send(request);
     }
 
     void shutdownWhenComplete() throws Exception
@@ -95,7 +98,7 @@ public class Client implements MessageListener
 
         if (_count < _expected)
         {
-            wait(10000L);
+            wait(1000000000);
         }
 
         if (_count < _expected)
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/Service.java b/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/Service.java
index 7fa38bad0d..3dc9a3ccfb 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/Service.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/Service.java
@@ -54,8 +54,9 @@ public class Service implements MessageListener
     Service(AMQConnection connection) throws Exception
     {
         _connection = connection;
-        AMQQueue queue = new SpecialQueue(connection, "ServiceQueue");
+        //AMQQueue queue = new SpecialQueue(connection, "ServiceQueue");
         _session = (AMQSession) _connection.createSession(false, AMQSession.NO_ACKNOWLEDGE);
+          AMQQueue queue  = (AMQQueue)  _session.createQueue("ServiceQueue") ;
         _session.createConsumer(queue).setMessageListener(this);
         _connection.start();
     }