Repository: hadoop
Updated Branches:
refs/heads/branch-2.6 1354ec1c7 -> c8dfc9126
HDFS-7305. NPE seen in wbhdfs FS while running SLive. Contributed by Jing Zhao.
Conflicts:
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c8dfc912
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c8dfc912
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c8dfc912
Branch: refs/heads/branch-2.6
Commit: c8dfc9126abb6dd553d82ba133ba8857857a694d
Parents: 1354ec1
Author: Jing Zhao <[email protected]>
Authored: Wed Oct 29 16:25:48 2014 -0700
Committer: Jing Zhao <[email protected]>
Committed: Wed Oct 29 16:28:50 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/c8dfc912/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 bc396b8..268f9de 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -856,6 +856,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/c8dfc912/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 55fba00..db606dc 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("Failed to obtain user group
information:")) {
+ if (re.getMessage() != null && re.getMessage().startsWith("Failed to
obtain user group information:")) {
String[] parts = re.getMessage().split(":\\s+", 3);
re = new RemoteException(parts[1], parts[2]);
re = ((RemoteException)re).unwrapRemoteException(InvalidToken.class);
