Author: borges Date: 2012-02-06 06:46:58 -0500 (Mon, 06 Feb 2012) New Revision: 12085 Modified: trunk/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/SimpleWaitIOCallback.java Log: HORNETQ-820 Restore hanging IO fix lost after merge from 2.2. Modified: trunk/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/SimpleWaitIOCallback.java =================================================================== --- trunk/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/SimpleWaitIOCallback.java 2012-02-03 16:05:31 UTC (rev 12084) +++ trunk/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/SimpleWaitIOCallback.java 2012-02-06 11:46:58 UTC (rev 12085) @@ -35,7 +35,8 @@ private volatile String errorMessage; private volatile int errorCode = 0; - + + @Override public String toString() { return "simpleWaitIOCallback"; @@ -60,7 +61,11 @@ @Override public void waitCompletion() throws Exception { - latch.await(); + while (true) + { + if (latch.await(2, TimeUnit.SECONDS)) + break; + } if (errorMessage != null) {