diff options
| author | Rajith Muditha Attapattu <rajith@apache.org> | 2011-03-17 21:56:04 +0000 |
|---|---|---|
| committer | Rajith Muditha Attapattu <rajith@apache.org> | 2011-03-17 21:56:04 +0000 |
| commit | d8febd2f9928209b715db37d41fd7abfa153913a (patch) | |
| tree | ede93fd26f179e700db96e05cdccab65643f79fc /qpid/java | |
| parent | 4a3c90a970302d33c15aecdda7073a8522f3eb15 (diff) | |
| download | qpid-python-d8febd2f9928209b715db37d41fd7abfa153913a.tar.gz | |
QPID-2959
Added a temp hack to get the testReplyToWithNamelessExchange passing with the java.0.10 test profile.
In doing so I realized that "qpid.declare_exchanges" has no affect on the producer side.
Therefore I added a check in BasicMessageProducer_0_10.java to check this flag before issuing an exchange_declare.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1082715 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
3 files changed, 16 insertions, 6 deletions
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java index 5fc8d43e94..d518d7b2c4 100644 --- a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java +++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java @@ -3461,4 +3461,9 @@ public abstract class AMQSession<C extends BasicMessageConsumer, P extends Basic { return _closing.get()|| _connection.isClosing(); } + + public boolean isDeclareExchanges() + { + return DECLARE_EXCHANGES; + } } diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java b/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java index 36f2dfb66f..62d1d1698c 100644 --- a/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java +++ b/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java @@ -72,12 +72,15 @@ public class BasicMessageProducer_0_10 extends BasicMessageProducer { if (destination.getDestSyntax() == DestSyntax.BURL) { - String name = destination.getExchangeName().toString(); - ((AMQSession_0_10) getSession()).getQpidSession().exchangeDeclare - (name, - destination.getExchangeClass().toString(), - null, null, - name.startsWith("amq.") ? Option.PASSIVE : Option.NONE); + if (getSession().isDeclareExchanges()) + { + String name = destination.getExchangeName().toString(); + ((AMQSession_0_10) getSession()).getQpidSession().exchangeDeclare + (name, + destination.getExchangeClass().toString(), + null, null, + name.startsWith("amq.") ? Option.PASSIVE : Option.NONE); + } } else { diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java index 931833408e..3c6942dbaa 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java @@ -990,7 +990,9 @@ public class AddressBasedDestinationTest extends QpidBrokerTestCase public void testReplyToWithNamelessExchange() throws Exception { + System.setProperty("qpid.declare_exchanges","false"); replyToTest("ADDR:my-queue;{create: always}"); + System.setProperty("qpid.declare_exchanges","true"); } public void testReplyToWithCustomExchange() throws Exception |