svn commit: r599375 - in /incubator/qpid/branches/M2.1.1/java/broker/src/main/java/org/apache/qpid/server/exchange: DefaultExchangeFactory.java FanoutExchange.java

[ritchiem]

Author: ritchiem
Date: Thu Nov 29 02:58:08 2007
New Revision: 599375

URL: http://svn.apache.org/viewvc?rev=599375&view=rev
Log:
Update to broker to address fanout python failure.

Modified:
    
incubator/qpid/branches/M2.1.1/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeFactory.java
    
incubator/qpid/branches/M2.1.1/java/broker/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java

Modified: 
incubator/qpid/branches/M2.1.1/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeFactory.java
URL: 
http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1.1/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeFactory.java?rev=599375&r1=599374&r2=599375&view=diff
==============================================================================
--- 
incubator/qpid/branches/M2.1.1/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeFactory.java
 (original)
+++ 
incubator/qpid/branches/M2.1.1/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeFactory.java
 Thu Nov 29 02:58:08 2007
@@ -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 @@
     {
         _exchangeClassMap.put(type.getName(), type);
     }
-    
+
     public Collection<ExchangeType<? extends Exchange>> getRegisteredTypes()
     {
         return _exchangeClassMap.values();
@@ -75,6 +75,12 @@
 
     public void initialise(Configuration hostConfig)
     {
+
+        if (hostConfig == null)
+        {
+            return;
+        }
+
         for(Object className : 
hostConfig.getList("custom-exchanges.class-name"))
         {
             try

Modified: 
incubator/qpid/branches/M2.1.1/java/broker/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java
URL: 
http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1.1/java/broker/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java?rev=599375&r1=599374&r2=599375&view=diff
==============================================================================
--- 
incubator/qpid/branches/M2.1.1/java/broker/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java
 (original)
+++ 
incubator/qpid/branches/M2.1.1/java/broker/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java
 Thu Nov 29 02:58:08 2007
@@ -142,7 +142,7 @@
 
        public AMQShortString getDefaultExchangeName()
        {
-               return ExchangeDefaults.DIRECT_EXCHANGE_NAME;
+               return ExchangeDefaults.FANOUT_EXCHANGE_NAME;
        }
     };