svn commit: r881847 - in /hadoop/zookeeper/trunk: CHANGES.txt src/java/main/org/apache/zookeeper/server/quorum/LearnerHandler.java

[breed]

Author: breed
Date: Wed Nov 18 17:44:56 2009
New Revision: 881847

URL: http://svn.apache.org/viewvc?rev=881847&view=rev
Log:
ZOOKEEPER-519. Followerhandler should close the socket if it gets an exception 
on a write.

Modified:
    hadoop/zookeeper/trunk/CHANGES.txt
    
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/LearnerHandler.java

Modified: hadoop/zookeeper/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/CHANGES.txt?rev=881847&r1=881846&r2=881847&view=diff
==============================================================================
--- hadoop/zookeeper/trunk/CHANGES.txt (original)
+++ hadoop/zookeeper/trunk/CHANGES.txt Wed Nov 18 17:44:56 2009
@@ -117,6 +117,9 @@
 
   ZOOKEEPER-532. java compiler should be target Java 1.5 (hiram chirino and 
phunt via breed)
 
+  ZOOKEEPER-519. Followerhandler should close the socket if it gets an 
exception on a write.
+  (mahadev via breed)
+
 IMPROVEMENTS:
   ZOOKEEPER-473. cleanup junit tests to eliminate false positives due to
   "socket reuse" and failure to close client (phunt via mahadev)

Modified: 
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/LearnerHandler.java
URL: 
http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/LearnerHandler.java?rev=881847&r1=881846&r2=881847&view=diff
==============================================================================
--- 
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/LearnerHandler.java
 (original)
+++ 
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/LearnerHandler.java
 Wed Nov 18 17:44:56 2009
@@ -420,6 +420,13 @@
             if (sock != null && !sock.isClosed()) {
                 LOG.error("Unexpected exception causing shutdown while sock "
                         + "still open", e);
+               //close the socket to make sure the 
+               //other side can see it being close
+               try {
+                       sock.close();
+               } catch(IOException ie) {
+                       // do nothing
+               }
             }
         } catch (InterruptedException e) {
             LOG.error("Unexpected exception causing shutdown", e);