Fix NPE in Find.java

containerAnalyzer · web-flow · commit c905fabc5ca6 · 2021-07-01T16:08:42.000+08:00
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
@@ -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<Expression>() {

Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,9 @@ private static String buildDescription(ExpressionFactory factory) {`
`114`	`114`	`if (expr.isOperator()) {`
`115`	`115`	`operators.add(expr);`
`116`	`116`	`} else {`
`117`		`- primaries.add(expr);`
	`117`	`+ if (expr != null) {`
	`118`	`+ primaries.add(expr);`
	`119`	`+ }`
`118`	`120`	`}`
`119`	`121`	`}`
`120`	`122`	`Collections.sort(operators, new Comparator<Expression>() {`