svn commit: r513968 - in /lucene/hadoop/trunk: CHANGES.txt src/java/org/apache/hadoop/ipc/Client.java

[cutting]

Author: cutting
Date: Fri Mar  2 13:35:16 2007
New Revision: 513968

URL: http://svn.apache.org/viewvc?view=rev&rev=513968
Log:
HADOOP-1049.  Fix a race condition in IPC client.  Contributed by Devaraj.

Modified:
    lucene/hadoop/trunk/CHANGES.txt
    lucene/hadoop/trunk/src/java/org/apache/hadoop/ipc/Client.java

Modified: lucene/hadoop/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/lucene/hadoop/trunk/CHANGES.txt?view=diff&rev=513968&r1=513967&r2=513968
==============================================================================
--- lucene/hadoop/trunk/CHANGES.txt (original)
+++ lucene/hadoop/trunk/CHANGES.txt Fri Mar  2 13:35:16 2007
@@ -189,6 +189,9 @@
     this developers must download the (LGPL'd) checkstyle jar
     themselves.  (tomwhite via cutting)
 
+58. HADOOP-1049.  Fix a race condition in IPC client.
+    (Devaraj Das via cutting)
+
 
 Release 0.11.2 - 2007-02-16
 

Modified: lucene/hadoop/trunk/src/java/org/apache/hadoop/ipc/Client.java
URL: 
http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/java/org/apache/hadoop/ipc/Client.java?view=diff&rev=513968&r1=513967&r2=513968
==============================================================================
--- lucene/hadoop/trunk/src/java/org/apache/hadoop/ipc/Client.java (original)
+++ lucene/hadoop/trunk/src/java/org/apache/hadoop/ipc/Client.java Fri Mar  2 
13:35:16 2007
@@ -155,6 +155,10 @@
             //inUse to infinity (everytime getConnection is called inUse is
             //incremented)!
             inUse = 0;
+            // set socket to null so that the next call to setupIOstreams
+            // can start the process of connect all over again.
+            socket.close();
+            socket = null;
             throw ie;
           }
           failures++;