svn commit: r1447613 - in /zookeeper/trunk: CHANGES.txt src/java/test/org/apache/zookeeper/test/WatcherTest.java

[ph...@apache.org]

Author: phunt
Date: Tue Feb 19 07:55:19 2013
New Revision: 1447613

URL: http://svn.apache.org/r1447613
Log:
ZOOKEEPER-1648. Fix WatcherTest in JDK7 (Thawan Kooburat via phunt)

Modified:
    zookeeper/trunk/CHANGES.txt
    zookeeper/trunk/src/java/test/org/apache/zookeeper/test/WatcherTest.java

Modified: zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1447613&r1=1447612&r2=1447613&view=diff
==============================================================================
--- zookeeper/trunk/CHANGES.txt (original)
+++ zookeeper/trunk/CHANGES.txt Tue Feb 19 07:55:19 2013
@@ -328,6 +328,9 @@ BUGFIXES:
   ZOOKEEPER-1641. Using slope=positive results in a jagged ganglia
   graph of packets rcvd/sent (Ben Hartshorne via phunt)
 
+  ZOOKEEPER-1648. Fix WatcherTest in JDK7
+  (Thawan Kooburat via phunt)
+
 IMPROVEMENTS:
 
   ZOOKEEPER-1170. Fix compiler (eclipse) warnings: unused imports,

Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/test/WatcherTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/WatcherTest.java?rev=1447613&r1=1447612&r2=1447613&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/test/WatcherTest.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/test/WatcherTest.java Tue Feb 19 07:55:19 2013
@@ -38,6 +38,7 @@ import org.apache.zookeeper.Watcher.Even
 import org.apache.zookeeper.ZooDefs.Ids;
 import org.apache.zookeeper.data.Stat;
 import org.junit.Assert;
+import org.junit.Before;
 import org.junit.Test;
 
 public class WatcherTest extends ClientBase {
@@ -67,6 +68,14 @@ public class WatcherTest extends ClientB
         }
     }
 
+    @Before
+    public void setUp() throws Exception {
+        super.setUp();
+        // Reset to default value since some test cases set this to true.
+        // Needed for JDK7 since unit test can run is random order
+        ClientCnxn.setDisableAutoResetWatch(false);
+    }
+
     /**
      * Verify that we get all of the events we expect to get. This particular
      * case verifies that we see all of the data events on a particular node.