[hornetq-commits] JBoss hornetq SVN: r9419 - in branches/2_2_0_HA_Improvements/src/main/org/hornetq/core: server/cluster/impl and 1 other directory.

[do-not-reply at jboss.org]

Author: jmesnil
Date: 2010-07-19 10:27:00 -0400 (Mon, 19 Jul 2010)
New Revision: 9419

Modified:
   branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/client/impl/ServerLocatorImpl.java
   branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java
Log:
HA refactoring

* fix NPE and ClassCastException

Modified: branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/client/impl/ServerLocatorImpl.java
===================================================================
--- branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/client/impl/ServerLocatorImpl.java	2010-07-19 14:25:47 UTC (rev 9418)
+++ branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/client/impl/ServerLocatorImpl.java	2010-07-19 14:27:00 UTC (rev 9419)
@@ -71,7 +71,7 @@
 
    private TransportConfiguration[] initialConnectors;
 
-   private Map<String, Pair<TransportConfiguration, TransportConfiguration>> topology;
+   private Map<String, Pair<TransportConfiguration, TransportConfiguration>> topology = new HashMap<String, Pair<TransportConfiguration,TransportConfiguration>>();
 
    private Pair<TransportConfiguration, TransportConfiguration>[] topologyArray;
 
@@ -1093,7 +1093,7 @@
    {
       List<DiscoveryEntry> newConnectors = discoveryGroup.getDiscoveryEntries();
 
-      this.initialConnectors = (TransportConfiguration[])Array.newInstance(Pair.class, newConnectors.size());
+      this.initialConnectors = (TransportConfiguration[])Array.newInstance(TransportConfiguration.class, newConnectors.size());
 
       int count = 0;
       for (DiscoveryEntry entry : newConnectors)

Modified: branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java
===================================================================
--- branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java	2010-07-19 14:25:47 UTC (rev 9418)
+++ branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java	2010-07-19 14:27:00 UTC (rev 9419)
@@ -224,7 +224,7 @@
 
    private Set<ClusterTopologyListener> clusterConnectionListeners = new ConcurrentHashSet<ClusterTopologyListener>();
 
-   private Map<String, Pair<TransportConfiguration, TransportConfiguration>> topology;
+   private Map<String, Pair<TransportConfiguration, TransportConfiguration>> topology = new HashMap<String, Pair<TransportConfiguration,TransportConfiguration>>();
 
    public synchronized void registerTopologyListener(final ClusterTopologyListener listener,
                                                      final boolean clusterConnection)