From 6f5f604a798b545faf6fadc9b66c8a8995b354db Mon Sep 17 00:00:00 2001 From: Jing Zhao Date: Wed, 29 Oct 2014 16:25:48 -0700 Subject: [PATCH] HDFS-7305. NPE seen in wbhdfs FS while running SLive. Contributed by Jing Zhao. --- 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(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index c33487f6bcf..11f757ace6e 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -1119,6 +1119,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 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 1c3c8022347..559efdb1cef 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 @@ -354,7 +354,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]);