You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by om...@apache.org on 2011/03/04 05:13:18 UTC

svn commit: r1077422 - /hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/ipc/Client.java

Author: omalley
Date: Fri Mar  4 04:13:18 2011
New Revision: 1077422

URL: http://svn.apache.org/viewvc?rev=1077422&view=rev
Log:
commit 6f095fb8d83ce1d8298de66da3f43cf8888abfad
Author: Devaraj Das <dd...@yahoo-inc.com>
Date:   Fri Apr 23 09:36:33 2010 -0700

    HADOOP:6718 from https://issues.apache.org/jira/secure/attachment/12442614/6718-bp20.patch
    
    +++ b/YAHOO-CHANGES.txt
    +    HADOOP-6718. Fixes a problem to do with clients not closing RPC
    +    connections on a SASL failure. (ddas)
    +

Modified:
    hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/ipc/Client.java

Modified: hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/ipc/Client.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/ipc/Client.java?rev=1077422&r1=1077421&r2=1077422&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/ipc/Client.java (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/ipc/Client.java Fri Mar  4 04:13:18 2011
@@ -446,7 +446,12 @@ public class Client {
           if (ticket.doAs(new PrivilegedExceptionAction<Boolean>() {
             @Override
             public Boolean run() throws IOException {
-              return setupSaslConnection(in2, out2);
+              try {
+                return setupSaslConnection(in2, out2);
+              } catch (IOException ie) {
+                handleConnectionFailure(1, 1, ie);
+                throw ie;
+              }
             }
           })) {
             // Sasl connect is successful. Let's set up Sasl i/o streams.