Repository: hadoop Updated Branches: refs/heads/branch-2 79c57e591 -> d25f8a12c
HDFS-7305. NPE seen in wbhdfs FS while running SLive. Contributed by Jing Zhao. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d25f8a12 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d25f8a12 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d25f8a12 Branch: refs/heads/branch-2 Commit: d25f8a12c6bbd8d5241d3e3aa46548f11bf8d42b Parents: 79c57e5 Author: Jing Zhao <[email protected]> Authored: Wed Oct 29 16:25:48 2014 -0700 Committer: Jing Zhao <[email protected]> Committed: Wed Oct 29 16:26:20 2014 -0700 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 1 + .../main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/d25f8a12/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index cd2a3e3..566a219 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -973,6 +973,7 @@ Release 2.6.0 - UNRELEASED HDFS-7300. The getMaxNodesPerRack() method in BlockPlacementPolicyDefault is flawed (kihwal) + HDFS-7305. NPE seen in wbhdfs FS while running SLive. (jing9) BREAKDOWN OF HDFS-6584 ARCHIVAL STORAGE http://git-wip-us.apache.org/repos/asf/hadoop/blob/d25f8a12/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java index bfe554f..7284b55 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java @@ -355,7 +355,7 @@ public class WebHdfsFileSystem extends FileSystem // extract UGI-related exceptions and unwrap InvalidToken // the NN mangles these exceptions but the DN does not and may need // to re-fetch a token if either report the token is expired - if (re.getMessage().startsWith( + if (re.getMessage() != null && re.getMessage().startsWith( SecurityUtil.FAILED_TO_GET_UGI_MSG_HEADER)) { String[] parts = re.getMessage().split(":\\s+", 3); re = new RemoteException(parts[1], parts[2]);
