Repository: hadoop Updated Branches: refs/heads/branch-2.9 ef42c2fda -> 41e0999b3
HDFS-7101. Potential null dereference in DFSck#doWork(). Contributed by skrho and Ted Yu. (cherry picked from commit 113af12cfb240ea9a7189bb2701693466eb8e993) (cherry picked from commit f055a53b43322a8d80a4aa362ec2a71d446334e7) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/41e0999b Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/41e0999b Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/41e0999b Branch: refs/heads/branch-2.9 Commit: 41e0999b3f967ac17e0e5fe692c0bcb7e03d8cab Parents: ef42c2f Author: Akira Ajisaka <aajis...@apache.org> Authored: Thu Apr 12 17:47:37 2018 +0900 Committer: Akira Ajisaka <aajis...@apache.org> Committed: Thu Apr 12 17:49:07 2018 +0900 ---------------------------------------------------------------------- .../src/main/java/org/apache/hadoop/hdfs/tools/DFSck.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/41e0999b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSck.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSck.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSck.java index 199f459..0c69b6d 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSck.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSck.java @@ -350,7 +350,7 @@ public class DFSck extends Configured implements Tool { BufferedReader input = new BufferedReader(new InputStreamReader( stream, "UTF-8")); String line = null; - String lastLine = null; + String lastLine = NamenodeFsck.CORRUPT_STATUS; int errCode = -1; try { while ((line = input.readLine()) != null) { --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
