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 2014/10/30 00:25:55 UTC

git commit: HDFS-7305. NPE seen in wbhdfs FS while running SLive. Contributed by Jing Zhao.

Repository: hadoop
Updated Branches:
  refs/heads/trunk 3ae84e1ba -> 6f5f604a7


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/6f5f604a
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6f5f604a
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6f5f604a

Branch: refs/heads/trunk
Commit: 6f5f604a798b545faf6fadc9b66c8a8995b354db
Parents: 3ae84e1
Author: Jing Zhao <ji...@apache.org>
Authored: Wed Oct 29 16:25:48 2014 -0700
Committer: Jing Zhao <ji...@apache.org>
Committed: Wed Oct 29 16:25:48 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/6f5f604a/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 c33487f..11f757a 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
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/6f5f604a/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 1c3c802..559efdb 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]);