1 files changed, 6 insertions, 2 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..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
         {