Repository: hadoop Updated Branches: refs/heads/branch-2 2c335a843 -> 73612294b
HADOOP-12178. NPE during handling of SASL setup if problem with SASL resolver class. Contributed by Steve Loughran (cherry picked from commit ed9806ea40b945df0637c21b68964d1d2bd204f3) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/73612294 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/73612294 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/73612294 Branch: refs/heads/branch-2 Commit: 73612294bdb7440a7b22dabe6eeb2857602e766b Parents: 2c335a8 Author: Zhihai Xu <z...@apache.org> Authored: Tue Oct 27 09:51:26 2015 -0700 Committer: Zhihai Xu <z...@apache.org> Committed: Tue Oct 27 10:09:45 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/73612294/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 8398ad0..b99fd7b 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -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() http://git-wip-us.apache.org/repos/asf/hadoop/blob/73612294/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 9c70382..ad43b62 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(); }
