Author: rgodfrey
Date: Thu Aug 28 15:01:36 2014
New Revision: 1621149
URL: http://svn.apache.org/r1621149
Log:
QPID-6052 : Use ADDR addresses for JMSDestination on incoming messages in 0-9-1
when the address mode is ADDR
Modified:
qpid/trunk/qpid/java/tools/src/main/java/org/apache/qpid/tools/MercuryBase.java
qpid/trunk/qpid/java/tools/src/main/java/org/apache/qpid/tools/QpidReceive.java
qpid/trunk/qpid/java/tools/src/main/java/org/apache/qpid/tools/QpidSend.java
Modified:
qpid/trunk/qpid/java/tools/src/main/java/org/apache/qpid/tools/MercuryBase.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/tools/src/main/java/org/apache/qpid/tools/MercuryBase.java?rev=1621149&r1=1621148&r2=1621149&view=diff
==============================================================================
---
qpid/trunk/qpid/java/tools/src/main/java/org/apache/qpid/tools/MercuryBase.java
(original)
+++
qpid/trunk/qpid/java/tools/src/main/java/org/apache/qpid/tools/MercuryBase.java
Thu Aug 28 15:01:36 2014
@@ -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);
}
}
Modified:
qpid/trunk/qpid/java/tools/src/main/java/org/apache/qpid/tools/QpidReceive.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/tools/src/main/java/org/apache/qpid/tools/QpidReceive.java?rev=1621149&r1=1621148&r2=1621149&view=diff
==============================================================================
---
qpid/trunk/qpid/java/tools/src/main/java/org/apache/qpid/tools/QpidReceive.java
(original)
+++
qpid/trunk/qpid/java/tools/src/main/java/org/apache/qpid/tools/QpidReceive.java
Thu Aug 28 15:01:36 2014
@@ -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 Mess
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 Mess
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());
Modified:
qpid/trunk/qpid/java/tools/src/main/java/org/apache/qpid/tools/QpidSend.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/tools/src/main/java/org/apache/qpid/tools/QpidSend.java?rev=1621149&r1=1621148&r2=1621149&view=diff
==============================================================================
---
qpid/trunk/qpid/java/tools/src/main/java/org/apache/qpid/tools/QpidSend.java
(original)
+++
qpid/trunk/qpid/java/tools/src/main/java/org/apache/qpid/tools/QpidSend.java
Thu Aug 28 15:01:36 2014
@@ -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();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
