diff options
| author | Rajith Muditha Attapattu <rajith@apache.org> | 2009-02-09 04:46:43 +0000 |
|---|---|---|
| committer | Rajith Muditha Attapattu <rajith@apache.org> | 2009-02-09 04:46:43 +0000 |
| commit | b0f5c074bb21fcdd9fd7c9680a05fb0de39f7268 (patch) | |
| tree | 3aab46cf6735ce6d9f1fae11394bbe6bb541ebbe | |
| parent | a25b1f9a7943127822e311c7dfa537133920b2d9 (diff) | |
| download | qpid-python-b0f5c074bb21fcdd9fd7c9680a05fb0de39f7268.tar.gz | |
This is a fix for QPID-1644
If the exchange name starts with "amq." then the passive flag will be set to true in the exchangeDeclare command
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@742255 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java | 9 | ||||
| -rw-r--r-- | qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_8.java | 4 |
2 files changed, 8 insertions, 5 deletions
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java index 82f56d9985..8d2e9996bb 100644 --- a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java +++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java @@ -495,10 +495,11 @@ public class AMQSession_0_10 extends AMQSession<BasicMessageConsumer_0_10, Basic final AMQProtocolHandler protocolHandler, final boolean nowait) throws AMQException, FailoverException { - getQpidSession().exchangeDeclare(name.toString(), type.toString(), null, null); - // autoDelete --> false - // durable --> false - // passive -- false + getQpidSession().exchangeDeclare(name.toString(), + type.toString(), + null, + null, + name.toString().startsWith("amq.")? Option.PASSIVE:Option.NONE); // We need to sync so that we get notify of an error. getQpidSession().sync(); getCurrentException(); diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_8.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_8.java index e5fc36c389..6451ae60be 100644 --- a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_8.java +++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_8.java @@ -298,7 +298,9 @@ public final class AMQSession_0_8 extends AMQSession<BasicMessageConsumer_0_8, B public void sendExchangeDeclare(final AMQShortString name, final AMQShortString type, final AMQProtocolHandler protocolHandler, final boolean nowait) throws AMQException, FailoverException { - ExchangeDeclareBody body = getMethodRegistry().createExchangeDeclareBody(getTicket(),name,type,false,false,false,false,nowait,null); + ExchangeDeclareBody body = getMethodRegistry().createExchangeDeclareBody(getTicket(),name,type, + name.toString().startsWith("amq."), + false,false,false,nowait,null); AMQFrame exchangeDeclare = body.generateFrame(_channelId); protocolHandler.syncWrite(exchangeDeclare, ExchangeDeclareOkBody.class); |