QPID-375 : Default Exchange fixes

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@509147 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 12 insertions, 6 deletions

diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeRegistry.java b/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeRegistry.java
index 00169e44ab..9b9765524c 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeRegistry.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeRegistry.java
@@ -84,8 +84,14 @@ public class DefaultExchangeRegistry implements ExchangeRegistry
 
     public Exchange getExchange(AMQShortString name)
     {
-
-        return _exchangeMap.get(name);
+        if((name == null) || name.length() == 0)
+        {
+            return getDefaultExchange();
+        }
+        else
+        {
+            return _exchangeMap.get(name);
+        }
 
     }
 
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/destinationurl/DestinationURLTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/client/destinationurl/DestinationURLTest.java
index b9394b87a1..66be1ebc73 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/client/destinationurl/DestinationURLTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/client/destinationurl/DestinationURLTest.java
@@ -131,7 +131,7 @@ public class DestinationURLTest extends TestCase
         AMQBindingURL dest = new AMQBindingURL(url);
 
         assertTrue(dest.getExchangeClass().equals(ExchangeDefaults.DIRECT_EXCHANGE_CLASS));
-        assertTrue(dest.getExchangeName().equals(ExchangeDefaults.DEFAULT_EXCHANGE_NAME));
+        assertTrue(dest.getExchangeName().equals(""));
         assertTrue(dest.getDestinationName().equals(""));
         assertTrue(dest.getQueueName().equals("IBMPerfQueue1"));
 
diff --git a/java/common/src/main/java/org/apache/qpid/exchange/ExchangeDefaults.java b/java/common/src/main/java/org/apache/qpid/exchange/ExchangeDefaults.java
index 55f9566955..9bb03c5df6 100644
--- a/java/common/src/main/java/org/apache/qpid/exchange/ExchangeDefaults.java
+++ b/java/common/src/main/java/org/apache/qpid/exchange/ExchangeDefaults.java
@@ -24,7 +24,7 @@ import org.apache.qpid.framing.AMQShortString;
 
 public class ExchangeDefaults
 {
-    public final static AMQShortString DEFAULT_EXCHANGE_NAME = new AMQShortString("");
+    public final static AMQShortString DEFAULT_EXCHANGE_NAME = new AMQShortString("<<default>>");
 
     public final static AMQShortString TOPIC_EXCHANGE_NAME = new AMQShortString("amq.topic");
 
diff --git a/java/common/src/main/java/org/apache/qpid/url/AMQBindingURL.java b/java/common/src/main/java/org/apache/qpid/url/AMQBindingURL.java
index d44fc3cbd5..f558523864 100644
--- a/java/common/src/main/java/org/apache/qpid/url/AMQBindingURL.java
+++ b/java/common/src/main/java/org/apache/qpid/url/AMQBindingURL.java
@@ -62,7 +62,7 @@ public class AMQBindingURL implements BindingURL
             if (exchangeClass == null)
             {
                 _url = ExchangeDefaults.DIRECT_EXCHANGE_CLASS + "://" +
-                        ExchangeDefaults.DEFAULT_EXCHANGE_NAME + "//" + _url;
+                        "" + "//" + _url;
                 //URLHelper.parseError(-1, "Exchange Class not specified.", _url);
                 parseBindingURL();
                 return;
@@ -78,7 +78,7 @@ public class AMQBindingURL implements BindingURL
             {
                 if(getExchangeClass().equals(ExchangeDefaults.DIRECT_EXCHANGE_CLASS))
                 {
-                    setExchangeName(ExchangeDefaults.DEFAULT_EXCHANGE_NAME);
+                    setExchangeName("");
                 }
                 else
                 {