svn commit: r1135850 - in /hadoop/common/branches/branch-0.20-security-205: CHANGES.txt src/hdfs/org/apache/hadoop/hdfs/DFSClient.java

[mattf]

Author: mattf
Date: Tue Jun 14 23:36:53 2011
New Revision: 1135850

URL: http://svn.apache.org/viewvc?rev=1135850&view=rev
Log:
undoing erroneous commit of HDFS-1836 to 0.20-security-205 intended for 
0.20-security branch

Modified:
    hadoop/common/branches/branch-0.20-security-205/CHANGES.txt
    
hadoop/common/branches/branch-0.20-security-205/src/hdfs/org/apache/hadoop/hdfs/DFSClient.java

Modified: hadoop/common/branches/branch-0.20-security-205/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-205/CHANGES.txt?rev=1135850&r1=1135849&r2=1135850&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-205/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20-security-205/CHANGES.txt Tue Jun 14 
23:36:53 2011
@@ -1,16 +1,5 @@
 Hadoop Change Log
 
-Release 0.20.206.0 - unreleased
-
-  NEW FEATURES
-
-  BUG FIXES
-
-  IMPROVEMENTS
-
-    HDFS-1836. Thousand of CLOSE_WAIT socket. Contributed by Todd Lipcon,
-    ported to security branch by Bharath Mundlapudi. (via mattf)
-
 Release 0.20.205.0 - unreleased
 
   BUG FIXES

Modified: 
hadoop/common/branches/branch-0.20-security-205/src/hdfs/org/apache/hadoop/hdfs/DFSClient.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-205/src/hdfs/org/apache/hadoop/hdfs/DFSClient.java?rev=1135850&r1=1135849&r2=1135850&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-0.20-security-205/src/hdfs/org/apache/hadoop/hdfs/DFSClient.java
 (original)
+++ 
hadoop/common/branches/branch-0.20-security-205/src/hdfs/org/apache/hadoop/hdfs/DFSClient.java
 Tue Jun 14 23:36:53 2011
@@ -2526,7 +2526,11 @@ public class DFSClient implements FSCons
             }
 
             synchronized (dataQueue) {
-              IOUtils.cleanup(LOG, blockStream, blockReplyStream);
+              try {
+                blockStream.close();
+                blockReplyStream.close();
+              } catch (IOException e) {
+              }
               nodes = null;
               response = null;
               blockStream = null;
@@ -2666,7 +2670,11 @@ public class DFSClient implements FSCons
       }
 
       if (blockStream != null) {
-        IOUtils.cleanup(LOG, blockStream, blockReplyStream);
+        try {
+          blockStream.close();
+          blockReplyStream.close();
+        } catch (IOException e) {
+        }
       }
       blockStream = null;
       blockReplyStream = null;
@@ -3409,7 +3417,8 @@ public class DFSClient implements FSCons
         synchronized (dataQueue) {
           if (blockStream != null) {
             blockStream.writeInt(0); // indicate end-of-block to datanode
-            IOUtils.cleanup(LOG, blockStream, blockReplyStream);
+            blockStream.close();
+            blockReplyStream.close();
           }
           if (s != null) {
             s.close();