Repository: hadoop
Updated Branches:
  refs/heads/branch-2 a48deb155 -> f055a53b4


HDFS-7101. Potential null dereference in DFSck#doWork(). Contributed by skrho 
and Ted Yu.

(cherry picked from commit 113af12cfb240ea9a7189bb2701693466eb8e993)


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

Branch: refs/heads/branch-2
Commit: f055a53b43322a8d80a4aa362ec2a71d446334e7
Parents: a48deb1
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:48:45 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/f055a53b/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

Reply via email to