1 files changed, 48 insertions, 24 deletions

diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/TestableZooKeeper.java b/zookeeper-server/src/test/java/org/apache/zookeeper/TestableZooKeeper.java
index 34c8c0cba..a02127aae 100644
--- a/zookeeper-server/src/test/java/org/apache/zookeeper/TestableZooKeeper.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/TestableZooKeeper.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -23,7 +23,6 @@ import java.net.SocketAddress;
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
-
 import org.apache.jute.Record;
 import org.apache.zookeeper.admin.ZooKeeperAdmin;
 import org.apache.zookeeper.client.HostProvider;
@@ -32,17 +31,29 @@ import org.apache.zookeeper.proto.RequestHeader;
 
 public class TestableZooKeeper extends ZooKeeperAdmin {
 
-    public TestableZooKeeper(String host, int sessionTimeout,
-            Watcher watcher) throws IOException {
+    public TestableZooKeeper(String host, int sessionTimeout, Watcher watcher) throws IOException {
         super(host, sessionTimeout, watcher);
     }
 
     class TestableClientCnxn extends ClientCnxn {
-        TestableClientCnxn(String chrootPath, HostProvider hostProvider, int sessionTimeout, ZooKeeper zooKeeper,
-            ClientWatchManager watcher, ClientCnxnSocket clientCnxnSocket, boolean canBeReadOnly)
-                throws IOException {
-            super(chrootPath, hostProvider, sessionTimeout, zooKeeper, watcher,
-                clientCnxnSocket, 0, new byte[16], canBeReadOnly);
+
+        TestableClientCnxn(
+            String chrootPath,
+            HostProvider hostProvider,
+            int sessionTimeout,
+            ZooKeeper zooKeeper,
+            ClientWatchManager watcher,
+            ClientCnxnSocket clientCnxnSocket,
+            boolean canBeReadOnly) throws IOException {
+            super(chrootPath,
+                  hostProvider,
+                  sessionTimeout,
+                  zooKeeper,
+                  watcher,
+                  clientCnxnSocket,
+                  0,
+                  new byte[16],
+                  canBeReadOnly);
         }
 
         void setXid(int newXid) {
@@ -52,36 +63,45 @@ public class TestableZooKeeper extends ZooKeeperAdmin {
         int checkXid() {
             return xid;
         }
+
     }
 
-    protected ClientCnxn createConnection(String chrootPath,
-            HostProvider hostProvider, int sessionTimeout, ZooKeeper zooKeeper,
-            ClientWatchManager watcher, ClientCnxnSocket clientCnxnSocket,
-            boolean canBeReadOnly) throws IOException {
-        return new TestableClientCnxn(chrootPath, hostProvider, sessionTimeout, this,
-                watcher, clientCnxnSocket, canBeReadOnly);
+    protected ClientCnxn createConnection(
+        String chrootPath,
+        HostProvider hostProvider,
+        int sessionTimeout,
+        ZooKeeper zooKeeper,
+        ClientWatchManager watcher,
+        ClientCnxnSocket clientCnxnSocket,
+        boolean canBeReadOnly) throws IOException {
+        return new TestableClientCnxn(
+            chrootPath,
+            hostProvider,
+            sessionTimeout,
+            this,
+            watcher,
+            clientCnxnSocket,
+            canBeReadOnly);
     }
 
     public void setXid(int xid) {
-        ((TestableClientCnxn)cnxn).setXid(xid);
+        ((TestableClientCnxn) cnxn).setXid(xid);
     }
 
     public int checkXid() {
-        return ((TestableClientCnxn)cnxn).checkXid();
+        return ((TestableClientCnxn) cnxn).checkXid();
     }
-    
+
     @Override
     public List<String> getChildWatches() {
         return super.getChildWatches();
     }
 
-
     @Override
     public List<String> getDataWatches() {
         return super.getDataWatches();
     }
 
-
     @Override
     public List<String> getExistWatches() {
         return super.getExistWatches();
@@ -92,7 +112,7 @@ public class TestableZooKeeper extends ZooKeeperAdmin {
      * later attempt to reconnect.
      */
     public void testableConnloss() throws IOException {
-        synchronized(cnxn) {
+        synchronized (cnxn) {
             cnxn.sendThread.testableCloseSocket();
         }
     }
@@ -107,7 +127,7 @@ public class TestableZooKeeper extends ZooKeeperAdmin {
         final CountDownLatch initiatedPause = new CountDownLatch(1);
         new Thread() {
             public void run() {
-                synchronized(cnxn) {
+                synchronized (cnxn) {
                     try {
                         try {
                             cnxn.sendThread.testableCloseSocket();
@@ -146,8 +166,11 @@ public class TestableZooKeeper extends ZooKeeperAdmin {
         return cnxn.getLastZxid();
     }
 
-    public ReplyHeader submitRequest(RequestHeader h, Record request,
-            Record response, WatchRegistration watchRegistration) throws InterruptedException {
+    public ReplyHeader submitRequest(
+        RequestHeader h,
+        Record request,
+        Record response,
+        WatchRegistration watchRegistration) throws InterruptedException {
         return cnxn.submitRequest(h, request, response, watchRegistration);
     }
 
@@ -159,4 +182,5 @@ public class TestableZooKeeper extends ZooKeeperAdmin {
     public void disconnect() {
         cnxn.disconnect();
     }
+
 }