summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRajith Muditha Attapattu <rajith@apache.org>2012-01-26 14:38:51 +0000
committerRajith Muditha Attapattu <rajith@apache.org>2012-01-26 14:38:51 +0000
commitac30fd4d4279cfe86c7f41b4aa552f4dfd3ec2a0 (patch)
treef46f3609af64e89dd46822d351ae6c96935f0095
parentd89e2aa23781d382b0e3ab9704e1058a011ebc3b (diff)
downloadqpid-python-ac30fd4d4279cfe86c7f41b4aa552f4dfd3ec2a0.tar.gz
QPID-3783 The AddressParser will now set the subject to Null if it equals to None.
The only drawback is that if somebody wants to use a subject called "None" which is hard to imagine :) However even if they want to use such a subject it will not be easy to distinguish due to the fact we print null subjects as None. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1236196 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/java/common/src/main/java/org/apache/qpid/messaging/util/AddressParser.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/messaging/util/AddressParser.java b/qpid/java/common/src/main/java/org/apache/qpid/messaging/util/AddressParser.java
index 7b31436ba0..9fb30f9b8a 100644
--- a/qpid/java/common/src/main/java/org/apache/qpid/messaging/util/AddressParser.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/messaging/util/AddressParser.java
@@ -257,6 +257,10 @@ public class AddressParser extends Parser
{
eat(SLASH);
subject = toks2str(eat_until(SEMI, EOF));
+ if ("None".equals(subject))
+ {
+ subject = null;
+ }
}
else
{