Author: clebert.suconic(a)jboss.com
Date: 2011-09-21 11:54:17 -0400 (Wed, 21 Sep 2011)
New Revision: 11384
Modified:
branches/Branch_2_2_EAP/src/main/org/hornetq/core/cluster/impl/DiscoveryGroupImpl.java
Log:
Fixing a scenario where a test was hang
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-09-21
15:35:42 UTC (rev 11383)
+++
branches/Branch_2_2_EAP/src/main/org/hornetq/core/cluster/impl/DiscoveryGroupImpl.java 2011-09-21
15:54:17 UTC (rev 11384)
@@ -171,13 +171,20 @@
synchronized (waitLock)
{
- waitLock.notify();
+ waitLock.notifyAll();
}
- socket.close();
+ try
+ {
+ socket.close();
+
+ socket = null;
+ }
+ catch (Throwable ignored)
+ {
+ log.warn(ignored.toString(), ignored);
+ }
- socket = null;
-
try
{
thread.interrupt();
@@ -393,7 +400,7 @@
{
received = true;
- waitLock.notify();
+ waitLock.notifyAll();
}
}
}