Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-12178. NPE during handling of SASL setup if problem with SASL resolver class. Contributed by Steve Loughran 

(cherry picked from commit ed9806ea40)
This commit is contained in:
Zhihai Xu 2015-10-27 09:51:26 -07:00
parent 2c335a8434
commit 73612294bd
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -680,6 +680,9 @@ Release 2.8.0 - UNRELEASED
HADOOP-12457. [JDK8] Fix a failure of compiling common by javadoc.
(Akira AJISAKA via ozawa)
HADOOP-12178. NPE during handling of SASL setup if problem with SASL
resolver class. (Steve Loughran via zxu)
OPTIMIZATIONS
HADOOP-12051. ProtobufRpcEngine.invoke() should use Exception.toString()

9
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
View File

@ -749,7 +749,12 @@ public class Client {
return setupSaslConnection(in2, out2);
}
});
} catch (Exception ex) {
} catch (IOException ex) {
if (saslRpcClient == null) {
// whatever happened -it can't be handled, so rethrow
throw ex;
}
// otherwise, assume a connection problem
authMethod = saslRpcClient.getAuthMethod();
if (rand == null) {
rand = new Random();
@ -811,7 +816,7 @@ public class Client {
if (t instanceof IOException) {
markClosed((IOException)t);
} else {
markClosed(new IOException("Couldn't set up IO streams", t));
markClosed(new IOException("Couldn't set up IO streams: " + t, t));
}
close();
}