Author: jmesnil Date: 2010-07-27 11:54:03 -0400 (Tue, 27 Jul 2010) New Revision: 9470 Modified: branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java Log: HA refactoring * start the cluster manager before the remoting service Modified: branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java =================================================================== --- branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2010-07-27 09:55:27 UTC (rev 9469) +++ branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2010-07-27 15:54:03 UTC (rev 9470) @@ -1582,16 +1582,11 @@ // We do this at the end - we don't want things like MDBs or other connections connecting to a backup server until // it is activated + clusterManager.start(); - // FIXME -- I inverted the order to start the remoting service before the cluster manager. - // when the cluster manager is started, it will form a cluster -> other nodes will then create bridges - // to connect to this server. If the remoting service is not started before, the connection will fail - // and the cluster will not be formed... initialised = true; remotingService.start(); - - clusterManager.start(); } /**