QPID-375 : remove assumptions on standard exchanges (amq.direct, amq.topic, etc), allow other exchanges to be created through virtualhosts.xml

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

1 files changed, 1 insertions, 8 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 c7803133b3..00169e44ab 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
@@ -85,14 +85,7 @@ public class DefaultExchangeRegistry implements ExchangeRegistry
     public Exchange getExchange(AMQShortString name)
     {
 
-        if(name == null || name.length() == 0)
-        {
-            return _defaultExchange;
-        }
-        else
-        {
-            return _exchangeMap.get(name);
-        }
+        return _exchangeMap.get(name);
 
     }