[Katta-commits] SF.net SVN: katta:[393] trunk/src/test/java/net/sf/katta/AbstractKattaTest. java

[<pi...@us...>]

Revision: 393
          http://katta.svn.sourceforge.net/katta/?rev=393&view=rev
Author:   pipenb
Date:     2009-03-27 13:56:31 +0000 (Fri, 27 Mar 2009)

Log Message:
-----------
Also release lock, when an exception is thrown.

Modified Paths:
--------------
    trunk/src/test/java/net/sf/katta/AbstractKattaTest.java

Modified: trunk/src/test/java/net/sf/katta/AbstractKattaTest.java
===================================================================
--- trunk/src/test/java/net/sf/katta/AbstractKattaTest.java	2009-03-27 05:42:01 UTC (rev 392)
+++ trunk/src/test/java/net/sf/katta/AbstractKattaTest.java	2009-03-27 13:56:31 UTC (rev 393)
@@ -221,13 +221,16 @@
     ZKClient zkClient = masterThread.getZkClient();
     ZkLock eventLock = zkClient.getEventLock();
     eventLock.lock();
-    while (masterThread.getMaster().getNodes().size() != nodeCount) {
-      if (System.currentTimeMillis() - startWait > 1000 * 60) {
-        break;
+    try {
+      while (masterThread.getMaster().getNodes().size() != nodeCount) {
+        if (System.currentTimeMillis() - startWait > 1000 * 60) {
+          break;
+        }
+        eventLock.getDataChangedCondition().await(10, TimeUnit.SECONDS);
       }
-      eventLock.getDataChangedCondition().await(10, TimeUnit.SECONDS);
+    } finally {
+      eventLock.unlock();
     }
-    eventLock.unlock();
     assertEquals(nodeCount, masterThread.getMaster().getNodes().size());
   }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.