Author: clebert.suconic(a)jboss.com Date: 2011-02-28 22:38:33 -0500 (Mon, 28 Feb 2011) New Revision: 10271 Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/cluster/impl/DiscoveryGroupImpl.java branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/discovery/DiscoveryTest.java Log: tweaks on test Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/cluster/impl/DiscoveryGroupImpl.java =================================================================== --- branches/Branch_2_2_EAP/src/main/org/hornetq/core/cluster/impl/DiscoveryGroupImpl.java 2011-02-28 22:59:42 UTC (rev 10270) +++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/cluster/impl/DiscoveryGroupImpl.java 2011-03-01 03:38:33 UTC (rev 10271) @@ -172,6 +172,7 @@ try { + thread.interrupt(); thread.join(); } catch (InterruptedException e) Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/discovery/DiscoveryTest.java =================================================================== --- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/discovery/DiscoveryTest.java 2011-02-28 22:59:42 UTC (rev 10270) +++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/discovery/DiscoveryTest.java 2011-03-01 03:38:33 UTC (rev 10271) @@ -252,6 +252,10 @@ entries = dg.getDiscoveryEntries(); assertEqualsDiscoveryEntries(Arrays.asList(live1), entries); + + dg.stop(); + + bg.stop(); } public void testIgnoreTrafficFromOwnNode() throws Exception