diff options
Diffstat (limited to 'qpid/java/common/src/main/java/org/apache/qpid/messaging')
5 files changed, 17 insertions, 12 deletions
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/messaging/Address.java b/qpid/java/common/src/main/java/org/apache/qpid/messaging/Address.java index d9c12148cb..bccae8e671 100644 --- a/qpid/java/common/src/main/java/org/apache/qpid/messaging/Address.java +++ b/qpid/java/common/src/main/java/org/apache/qpid/messaging/Address.java @@ -20,12 +20,12 @@ */ package org.apache.qpid.messaging; -import java.util.Map; - import org.apache.qpid.messaging.util.AddressParser; import static org.apache.qpid.messaging.util.PyPrint.pprint; +import java.util.Map; + /** * Address 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..d1e10607ac 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 @@ -20,13 +20,13 @@ */ package org.apache.qpid.messaging.util; +import org.apache.qpid.messaging.Address; + import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.qpid.messaging.Address; - /** * AddressParser @@ -257,6 +257,10 @@ public class AddressParser extends Parser { eat(SLASH); subject = toks2str(eat_until(SEMI, EOF)); + if ("None".equals(subject)) + { + subject = null; + } } else { diff --git a/qpid/java/common/src/main/java/org/apache/qpid/messaging/util/JAddr.java b/qpid/java/common/src/main/java/org/apache/qpid/messaging/util/JAddr.java index 93df052af1..c5c2cacd1a 100644 --- a/qpid/java/common/src/main/java/org/apache/qpid/messaging/util/JAddr.java +++ b/qpid/java/common/src/main/java/org/apache/qpid/messaging/util/JAddr.java @@ -20,16 +20,13 @@ */ package org.apache.qpid.messaging.util; -import java.io.InputStreamReader; - -import java.util.List; - import org.apache.qpid.messaging.Address; -import org.apache.qpid.messaging.util.ParseError; -import org.apache.qpid.messaging.util.Token; import static org.apache.qpid.messaging.util.PyPrint.pprint; +import java.io.InputStreamReader; +import java.util.List; + /** * JAddr @@ -38,6 +35,9 @@ import static org.apache.qpid.messaging.util.PyPrint.pprint; public class JAddr { + private JAddr() + { + } public static final void main(String[] args) throws Exception { diff --git a/qpid/java/common/src/main/java/org/apache/qpid/messaging/util/Lexer.java b/qpid/java/common/src/main/java/org/apache/qpid/messaging/util/Lexer.java index 8226cc77cb..9638ec78e2 100644 --- a/qpid/java/common/src/main/java/org/apache/qpid/messaging/util/Lexer.java +++ b/qpid/java/common/src/main/java/org/apache/qpid/messaging/util/Lexer.java @@ -21,9 +21,7 @@ package org.apache.qpid.messaging.util; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; -import java.util.NoSuchElementException; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/qpid/java/common/src/main/java/org/apache/qpid/messaging/util/PyPrint.java b/qpid/java/common/src/main/java/org/apache/qpid/messaging/util/PyPrint.java index ef6c724371..2681893482 100644 --- a/qpid/java/common/src/main/java/org/apache/qpid/messaging/util/PyPrint.java +++ b/qpid/java/common/src/main/java/org/apache/qpid/messaging/util/PyPrint.java @@ -33,6 +33,9 @@ import java.util.Map; public class PyPrint { + private PyPrint() + { + } public static String pprint(Object obj) { |