Author: rajith
Date: Thu Mar 17 21:56:04 2011
New Revision: 1082715
URL: http://svn.apache.org/viewvc?rev=1082715&view=rev
Log:
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.
Modified:
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java
Modified:
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java?rev=1082715&r1=1082714&r2=1082715&view=diff
==============================================================================
---
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
(original)
+++
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
Thu Mar 17 21:56:04 2011
@@ -3461,4 +3461,9 @@ public abstract class AMQSession<C exten
{
return _closing.get()|| _connection.isClosing();
}
+
+ public boolean isDeclareExchanges()
+ {
+ return DECLARE_EXCHANGES;
+ }
}
Modified:
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java?rev=1082715&r1=1082714&r2=1082715&view=diff
==============================================================================
---
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java
(original)
+++
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java
Thu Mar 17 21:56:04 2011
@@ -72,12 +72,15 @@ public class BasicMessageProducer_0_10 e
{
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
{
Modified:
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java?rev=1082715&r1=1082714&r2=1082715&view=diff
==============================================================================
---
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java
(original)
+++
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java
Thu Mar 17 21:56:04 2011
@@ -990,7 +990,9 @@ public class AddressBasedDestinationTest
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
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
