HDFS-2057. Wait time to terminate the threads causes unit tests to take longer time. Contributed by Bharath Mundlapudi.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.20-security@1134140 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -152,6 +152,9 @@ Release 0.20.204.0 - unreleased
     by throwing an error to indicate the editlog needs to be empty.
     (suresh)
 
+    HDFS-2057. Wait time to terminate the threads causes unit tests to
+    take longer time. (Bharath Mundlapudi via suresh)
+
   IMPROVEMENTS
 
     HDFS-2023. Backport of NPE for File.list and File.listFiles.

src/core/org/apache/hadoop/ipc/Server.java

@@ -568,12 +568,6 @@ public abstract class Server {
         }
       }
       readPool.shutdown();
-      try {
-          readPool.awaitTermination(10, TimeUnit.SECONDS);
-      } catch (InterruptedException e) {
-       LOG.info("Exception occured in doStop:" + e.getMessage());
-      }
-      readPool.shutdownNow();
     }
 
     // The method that will return the next reader to work with