diff options
Diffstat (limited to 'qpid/java/tools/src/main/java/org')
3 files changed, 7 insertions, 10 deletions
diff --git a/qpid/java/tools/src/main/java/org/apache/qpid/tools/MercuryBase.java b/qpid/java/tools/src/main/java/org/apache/qpid/tools/MercuryBase.java index 097b021b3e..7ceef47573 100644 --- a/qpid/java/tools/src/main/java/org/apache/qpid/tools/MercuryBase.java +++ b/qpid/java/tools/src/main/java/org/apache/qpid/tools/MercuryBase.java @@ -30,7 +30,6 @@ import javax.jms.MessageConsumer; import javax.jms.MessageProducer; import javax.jms.Session; -import org.apache.qpid.client.AMQAnyDestination; import org.apache.qpid.client.AMQDestination; import org.apache.qpid.client.AMQSession_0_10; import org.apache.qpid.messaging.Address; @@ -107,7 +106,7 @@ public class MercuryBase controllerSession = con.createSession(false, Session.AUTO_ACKNOWLEDGE); dest = createDestination(); - controllerQueue = AMQDestination.createDestination(CONTROLLER_ADDR); + controllerQueue = AMQDestination.createDestination(CONTROLLER_ADDR, false); myControlQueue = session.createQueue(myControlQueueAddr); msgType = MessageType.getType(config.getMessageType()); _logger.debug("Using " + msgType + " messages"); @@ -122,7 +121,7 @@ public class MercuryBase { _logger.debug("Prefix : " + prefix); Address addr = Address.parse(config.getAddress()); - AMQDestination temp = (AMQDestination) AMQDestination.createDestination(config.getAddress()); + AMQDestination temp = (AMQDestination) AMQDestination.createDestination(config.getAddress(), false); int type = ((AMQSession_0_10)session).resolveAddressType(temp); if ( type == AMQDestination.TOPIC_TYPE) @@ -136,11 +135,11 @@ public class MercuryBase System.out.println("Setting name : " + addr); } - return AMQDestination.createDestination(addr.toString()); + return AMQDestination.createDestination(addr.toString(), false); } else { - return AMQDestination.createDestination(config.getAddress()); + return AMQDestination.createDestination(config.getAddress(), false); } } diff --git a/qpid/java/tools/src/main/java/org/apache/qpid/tools/QpidReceive.java b/qpid/java/tools/src/main/java/org/apache/qpid/tools/QpidReceive.java index 6dd8b7e1ca..4092f0d59d 100644 --- a/qpid/java/tools/src/main/java/org/apache/qpid/tools/QpidReceive.java +++ b/qpid/java/tools/src/main/java/org/apache/qpid/tools/QpidReceive.java @@ -34,10 +34,8 @@ import javax.jms.TextMessage; import org.apache.qpid.client.AMQDestination; import org.apache.qpid.client.message.AbstractJMSMessage; -import org.apache.qpid.tools.TestConfiguration.MessageType; import org.apache.qpid.tools.report.BasicReporter; import org.apache.qpid.tools.report.Reporter; -import org.apache.qpid.tools.report.Statistics.Throughput; import org.apache.qpid.tools.report.Statistics.ThroughputAndLatency; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -107,7 +105,7 @@ public class QpidReceive implements MessageListener if (config.getReadyAddress() != null) { MessageProducer prod = session.createProducer(AMQDestination - .createDestination(config.getReadyAddress())); + .createDestination(config.getReadyAddress(), false)); prod.send(session.createMessage()); if (_logger.isDebugEnabled()) { @@ -193,7 +191,7 @@ public class QpidReceive implements MessageListener System.out, config.reportEvery(), config.isReportHeader()); - Destination dest = AMQDestination.createDestination(config.getAddress()); + Destination dest = AMQDestination.createDestination(config.getAddress(), false); QpidReceive receiver = new QpidReceive(reporter,config, config.createConnection(),dest); receiver.setUp(); receiver.waitforCompletion(config.getMsgCount() + config.getSendEOS()); diff --git a/qpid/java/tools/src/main/java/org/apache/qpid/tools/QpidSend.java b/qpid/java/tools/src/main/java/org/apache/qpid/tools/QpidSend.java index 3d321dcade..58a643726c 100644 --- a/qpid/java/tools/src/main/java/org/apache/qpid/tools/QpidSend.java +++ b/qpid/java/tools/src/main/java/org/apache/qpid/tools/QpidSend.java @@ -286,7 +286,7 @@ public class QpidSend config.reportEvery(), config.isReportHeader() ); - Destination dest = AMQDestination.createDestination(config.getAddress()); + Destination dest = AMQDestination.createDestination(config.getAddress(), false); QpidSend sender = new QpidSend(reporter,config, config.createConnection(),dest); sender.setUp(); sender.send(); |