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 ji...@apache.org on 2015/10/30 19:00:20 UTC
[07/30] hadoop git commit: HADOOP-12178. NPE during handling of SASL
setup if problem with SASL resolver class. Contributed by Steve Loughran
HADOOP-12178. NPE during handling of SASL setup if problem with SASL resolver class. Contributed by Steve Loughran
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ed9806ea
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ed9806ea
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ed9806ea
Branch: refs/heads/HDFS-8966
Commit: ed9806ea40b945df0637c21b68964d1d2bd204f3
Parents: aa09880
Author: Zhihai Xu <zx...@apache.org>
Authored: Tue Oct 27 09:51:26 2015 -0700
Committer: Zhihai Xu <zx...@apache.org>
Committed: Tue Oct 27 09:51:26 2015 -0700
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++
.../src/main/java/org/apache/hadoop/ipc/Client.java | 9 +++++++--
2 files changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/ed9806ea/hadoop-common-project/hadoop-common/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 01512bd..9ba6275 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -1271,6 +1271,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()
http://git-wip-us.apache.org/repos/asf/hadoop/blob/ed9806ea/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
index f067d59..5917e09 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
@@ -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();
}