diff options
| author | Rajith Muditha Attapattu <rajith@apache.org> | 2011-03-09 21:17:52 +0000 |
|---|---|---|
| committer | Rajith Muditha Attapattu <rajith@apache.org> | 2011-03-09 21:17:52 +0000 |
| commit | 4e8519419b8b47e795c825c057735c57bf586479 (patch) | |
| tree | e80523bd69fcdeaeff08745e9874c0b2406918e1 | |
| parent | b1d8fa539615fdf8ec6d996bb4644003fdee1fa5 (diff) | |
| download | qpid-python-4e8519419b8b47e795c825c057735c57bf586479.tar.gz | |
Porting rev 1078971 from Qpid trunk to 0.10 branch.
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.10@1080006 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java | 16 | ||||
| -rw-r--r-- | qpid/java/client/src/main/java/org/apache/qpid/client/messaging/address/Link.java | 7 |
2 files changed, 19 insertions, 4 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 6b4f6c1640..7398a89e9a 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 @@ -1173,6 +1173,22 @@ public class AMQSession_0_10 extends AMQSession<BasicMessageConsumer_0_10, Basic int type = resolveAddressType(dest); + if (type == AMQDestination.QUEUE_TYPE && + dest.getLink().getReliability() == Reliability.UNSPECIFIED) + { + dest.getLink().setReliability(Reliability.AT_LEAST_ONCE); + } + else if (type == AMQDestination.TOPIC_TYPE && + dest.getLink().getReliability() == Reliability.UNSPECIFIED) + { + dest.getLink().setReliability(Reliability.UNRELIABLE); + } + else if (type == AMQDestination.TOPIC_TYPE && + dest.getLink().getReliability() == Reliability.AT_LEAST_ONCE) + { + throw new AMQException("AT-LEAST-ONCE is not yet supported for Topics"); + } + switch (type) { case AMQDestination.QUEUE_TYPE: diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/messaging/address/Link.java b/qpid/java/client/src/main/java/org/apache/qpid/client/messaging/address/Link.java index f10c6f7fca..5f97d625b4 100644 --- a/qpid/java/client/src/main/java/org/apache/qpid/client/messaging/address/Link.java +++ b/qpid/java/client/src/main/java/org/apache/qpid/client/messaging/address/Link.java @@ -20,8 +20,7 @@ */ package org.apache.qpid.client.messaging.address; -import static org.apache.qpid.client.messaging.address.Link.Reliability.UNRELIABLE; -import static org.apache.qpid.client.messaging.address.Link.Reliability.AT_LEAST_ONCE; +import static org.apache.qpid.client.messaging.address.Link.Reliability.UNSPECIFIED; import java.util.HashMap; import java.util.Map; @@ -32,7 +31,7 @@ public class Link { public enum FilterType { SQL92, XQUERY, SUBJECT } - public enum Reliability { UNRELIABLE, AT_MOST_ONCE, AT_LEAST_ONCE, EXACTLY_ONCE } + public enum Reliability { UNRELIABLE, AT_MOST_ONCE, AT_LEAST_ONCE, EXACTLY_ONCE, UNSPECIFIED } protected String name; protected String _filter; @@ -43,7 +42,7 @@ public class Link protected int _producerCapacity = 0; protected Node node; protected Subscription subscription; - protected Reliability reliability = AT_LEAST_ONCE; + protected Reliability reliability = UNSPECIFIED; public Reliability getReliability() { |