svn commit: r1134140 - in /hadoop/common/branches/branch-0.20-security: CHANGES.txt src/core/org/apache/hadoop/ipc/Server.java

[su...@apache.org]

Author: suresh
Date: Fri Jun 10 00:29:21 2011
New Revision: 1134140

URL: http://svn.apache.org/viewvc?rev=1134140&view=rev
Log:
HDFS-2057. Wait time to terminate the threads causes unit tests to take longer time. Contributed by Bharath Mundlapudi.

Modified:
    hadoop/common/branches/branch-0.20-security/CHANGES.txt
    hadoop/common/branches/branch-0.20-security/src/core/org/apache/hadoop/ipc/Server.java

Modified: hadoop/common/branches/branch-0.20-security/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/CHANGES.txt?rev=1134140&r1=1134139&r2=1134140&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20-security/CHANGES.txt Fri Jun 10 00:29:21 2011
@@ -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.

Modified: hadoop/common/branches/branch-0.20-security/src/core/org/apache/hadoop/ipc/Server.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/src/core/org/apache/hadoop/ipc/Server.java?rev=1134140&r1=1134139&r2=1134140&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/src/core/org/apache/hadoop/ipc/Server.java (original)
+++ hadoop/common/branches/branch-0.20-security/src/core/org/apache/hadoop/ipc/Server.java Fri Jun 10 00:29:21 2011
@@ -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