ZOOKEEPER-881. ZooKeeperServer.loadData loads database twice (jared cantwell via breed)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/zookeeper/trunk@1022824 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -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)

src/java/main/org/apache/zookeeper/server/ZooKeeperServer.java

@@ -238,7 +238,6 @@ public class ZooKeeperServer implements SessionExpirer, ServerStats.Provider {
      *  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>();