Author: breed Date: Fri Oct 15 05:21:26 2010 New Revision: 1022824 URL: http://svn.apache.org/viewvc?rev=1022824&view=rev Log: ZOOKEEPER-881. ZooKeeperServer.loadData loads database twice (jared cantwell via breed)
Modified: hadoop/zookeeper/trunk/CHANGES.txt hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ZooKeeperServer.java Modified: hadoop/zookeeper/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/CHANGES.txt?rev=1022824&r1=1022823&r2=1022824&view=diff ============================================================================== --- hadoop/zookeeper/trunk/CHANGES.txt (original) +++ hadoop/zookeeper/trunk/CHANGES.txt Fri Oct 15 05:21:26 2010 @@ -112,6 +112,8 @@ BUGFIXES: ZOOKEEPER-866. Hedwig Server stays in "disconnected" state when connection to ZK dies but gets reconnected (erwin tam via breed) + ZOOKEEPER-881. ZooKeeperServer.loadData loads database twice (jared cantwell via breed) + IMPROVEMENTS: ZOOKEEPER-724. Improve junit test integration - log harness information (phunt via mahadev) Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ZooKeeperServer.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ZooKeeperServer.java?rev=1022824&r1=1022823&r2=1022824&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ZooKeeperServer.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ZooKeeperServer.java Fri Oct 15 05:21:26 2010 @@ -238,7 +238,6 @@ public class ZooKeeperServer implements * Restore sessions and data */ public void loadData() throws IOException, InterruptedException { - zkDb.loadDataBase(); setZxid(zkDb.loadDataBase()); // Clean up dead sessions LinkedList<Long> deadSessions = new LinkedList<Long>();