Update to broker to address fanout python failure.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1.1@599375 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 10 insertions, 4 deletions

diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeFactory.java b/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeFactory.java
index 8ede553464..1a9dc6673a 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeFactory.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeFactory.java
@@ -7,9 +7,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -53,7 +53,7 @@ public class DefaultExchangeFactory implements ExchangeFactory
     {
         _exchangeClassMap.put(type.getName(), type);
     }
-    
+
     public Collection<ExchangeType<? extends Exchange>> getRegisteredTypes()
     {
         return _exchangeClassMap.values();
@@ -75,6 +75,12 @@ public class DefaultExchangeFactory implements ExchangeFactory
 
     public void initialise(Configuration hostConfig)
     {
+
+        if (hostConfig == null)
+        {
+            return;
+        }
+
         for(Object className : hostConfig.getList("custom-exchanges.class-name"))
         {
             try
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java b/java/broker/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java
index f7af44b232..6f5c66b57e 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java
@@ -142,7 +142,7 @@ public class FanoutExchange extends AbstractExchange
 

     	public AMQShortString getDefaultExchangeName()

     	{

-    		return ExchangeDefaults.DIRECT_EXCHANGE_NAME;

+    		return ExchangeDefaults.FANOUT_EXCHANGE_NAME;

     	}

     };