From c905fabc5ca69f89cc69f555b69dacdc1c4cbb39 Mon Sep 17 00:00:00 2001 From: containerAnalyzer <85693199+containerAnalyzer@users.noreply.github.com> Date: Thu, 1 Jul 2021 16:08:42 +0800 Subject: [PATCH 1/3] Fix NPE in Find.java --- .../src/main/java/org/apache/hadoop/fs/shell/find/Find.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/find/Find.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/find/Find.java index 199038a751226..979c630749d29 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/find/Find.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/find/Find.java @@ -114,7 +114,9 @@ private static String buildDescription(ExpressionFactory factory) { if (expr.isOperator()) { operators.add(expr); } else { - primaries.add(expr); + if (expr != null) { + primaries.add(expr); + } } } Collections.sort(operators, new Comparator() { From dc98af81ce922f62ac0c8dc29c81e75bef636f70 Mon Sep 17 00:00:00 2001 From: containerAnalyzer <85693199+containerAnalyzer@users.noreply.github.com> Date: Thu, 1 Jul 2021 16:17:25 +0800 Subject: [PATCH 2/3] Fix an NPE in DancingLinks.java --- .../org/apache/hadoop/examples/dancing/DancingLinks.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/dancing/DancingLinks.java b/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/dancing/DancingLinks.java index eef44617ce376..8f4004eb08474 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/dancing/DancingLinks.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/dancing/DancingLinks.java @@ -420,7 +420,10 @@ public int solve(int[] prefix, SolutionAcceptor output) { } int result = search(choices, output); for(int i=prefix.length-1; i >=0; --i) { - rollback(choices.get(i)); + Node choice = choices.get(i); + if (choice != null) { + rollback(choice); + } } return result; } From c470ce6f1c1c7e37825b71cc2ea280f904bc12ad Mon Sep 17 00:00:00 2001 From: containerAnalyzer <85693199+containerAnalyzer@users.noreply.github.com> Date: Wed, 7 Jul 2021 23:52:02 +0800 Subject: [PATCH 3/3] Fix NPE in DumpS3GuardDynamoTable.java --- .../hadoop/fs/s3a/s3guard/DumpS3GuardDynamoTable.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/s3guard/DumpS3GuardDynamoTable.java b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/s3guard/DumpS3GuardDynamoTable.java index e4c9ef6de8ba3..b5d37e8b3154d 100644 --- a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/s3guard/DumpS3GuardDynamoTable.java +++ b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/s3guard/DumpS3GuardDynamoTable.java @@ -415,8 +415,11 @@ private Pair dumpStoreEntries( } List childMD = new ArrayList<>(childDirs.size()); for (DDBPathMetadata childDir : childDirs) { - childMD.add(getStore().listChildren( - childDir.getFileStatus().getPath())); + DirListingMetadata data = getStore().listChildren( + childDir.getFileStatus().getPath()); + if (data != null) { + childMD.add(data); + } } pushAll(queue, childMD); }