Author: borges Date: 2011-10-21 10:14:17 -0400 (Fri, 21 Oct 2011) New Revision: 11573 Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java Log: Fix NPE on cleanUp of OnewayTwoNodeClusterTest.testNeverStartTargetStartSourceThenStopSource Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java =================================================================== --- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java 2011-10-21 14:14:04 UTC (rev 11572) +++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java 2011-10-21 14:14:17 UTC (rev 11573) @@ -169,9 +169,13 @@ if (servers[i] == null) continue; - for (ClusterConnection cc : servers[i].getClusterManager().getClusterConnections()) + final ClusterManager clusterManager = servers[i].getClusterManager(); + if (clusterManager != null) { - cc.stop(); + for (ClusterConnection cc : clusterManager.getClusterConnections()) + { + cc.stop(); + } } stopComponent(servers[i]);