Author: clebert.suconic(a)jboss.com Date: 2011-08-29 15:59:41 -0400 (Mon, 29 Aug 2011) New Revision: 11236 Modified: branches/Branch_2_2_EAP_cluster_clean3/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java branches/Branch_2_2_EAP_cluster_clean3/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java Log: tweaks Modified: branches/Branch_2_2_EAP_cluster_clean3/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java =================================================================== --- branches/Branch_2_2_EAP_cluster_clean3/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java 2011-08-29 19:49:15 UTC (rev 11235) +++ branches/Branch_2_2_EAP_cluster_clean3/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java 2011-08-29 19:59:41 UTC (rev 11236) @@ -504,7 +504,7 @@ serverLocator.start(server.getExecutorFactory().getExecutor()); - serverLocator.getExecutor().execute(new Runnable(){ + /* serverLocator.getExecutor().execute(new Runnable(){ public void run() { try @@ -522,7 +522,7 @@ log.warn("Error on connectin Cluster connection to other nodes", e); } } - }); + });*/ } if (managementService != null) Modified: branches/Branch_2_2_EAP_cluster_clean3/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java =================================================================== --- branches/Branch_2_2_EAP_cluster_clean3/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java 2011-08-29 19:49:15 UTC (rev 11235) +++ branches/Branch_2_2_EAP_cluster_clean3/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java 2011-08-29 19:59:41 UTC (rev 11236) @@ -202,15 +202,10 @@ if (connectorName == null) { connectorName = config.getConnectorName(); + break; } - else if (!connectorName.equals(config.getConnectorName())) - { - throw new IllegalStateException("Using multiple connector names on cluster connections it's " - + "not supported at this time"); - } + } - } - if (connectorName != null) { TransportConfiguration nodeConnector = configuration.getConnectorConfigurations().get(connectorName);