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 xy...@apache.org on 2018/03/15 18:02:37 UTC

hadoop git commit: HDFS-13280. WebHDFS: Fix NPE in get snasphottable directory list call. Contributed by Lokesh Jain.

Repository: hadoop
Updated Branches:
  refs/heads/trunk e71bc00a4 -> 78b05fde6


HDFS-13280. WebHDFS: Fix NPE in get snasphottable directory list call. Contributed by Lokesh Jain.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/78b05fde
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/78b05fde
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/78b05fde

Branch: refs/heads/trunk
Commit: 78b05fde6c41f7a6b2dc2d99b435d1d83242590c
Parents: e71bc00
Author: Xiaoyu Yao <xy...@apache.org>
Authored: Thu Mar 15 10:47:29 2018 -0700
Committer: Xiaoyu Yao <xy...@apache.org>
Committed: Thu Mar 15 11:02:27 2018 -0700

----------------------------------------------------------------------
 .../src/main/java/org/apache/hadoop/hdfs/web/JsonUtil.java     | 3 +++
 .../src/test/java/org/apache/hadoop/hdfs/web/TestWebHDFS.java  | 6 ++++--
 2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/78b05fde/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/JsonUtil.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/JsonUtil.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/JsonUtil.java
index bdb2c07..43a252b 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/JsonUtil.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/JsonUtil.java
@@ -533,6 +533,9 @@ public class JsonUtil {
 
   public static String toJsonString(
       SnapshottableDirectoryStatus[] snapshottableDirectoryList) {
+    if (snapshottableDirectoryList == null) {
+      return toJsonString("SnapshottableDirectoryList", null);
+    }
     Object[] a = new Object[snapshottableDirectoryList.length];
     for (int i = 0; i < snapshottableDirectoryList.length; i++) {
       a[i] = toJsonMap(snapshottableDirectoryList[i]);

http://git-wip-us.apache.org/repos/asf/hadoop/blob/78b05fde/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/web/TestWebHDFS.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/web/TestWebHDFS.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/web/TestWebHDFS.java
index c4e3016..2247355 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/web/TestWebHDFS.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/web/TestWebHDFS.java
@@ -755,14 +755,16 @@ public class TestWebHDFS {
       final Path bar = new Path("/bar");
       dfs.mkdirs(foo);
       dfs.mkdirs(bar);
+      SnapshottableDirectoryStatus[] statuses =
+          webHdfs.getSnapshottableDirectoryList();
+      Assert.assertNull(statuses);
       dfs.allowSnapshot(foo);
       dfs.allowSnapshot(bar);
       Path file0 = new Path(foo, "file0");
       DFSTestUtil.createFile(dfs, file0, 100, (short) 1, 0);
       Path file1 = new Path(bar, "file1");
       DFSTestUtil.createFile(dfs, file1, 100, (short) 1, 0);
-      SnapshottableDirectoryStatus[] statuses =
-          webHdfs.getSnapshottableDirectoryList();
+      statuses = webHdfs.getSnapshottableDirectoryList();
       SnapshottableDirectoryStatus[] dfsStatuses =
           dfs.getSnapshottableDirListing();
 


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org