HADOOP-19305: Fix ProcessEnvironment ClassCastException in Shell.java

zhangbutao · zhangbutao · commit 2625e99d8d64 · 2025-01-06T15:57:24.000+08:00
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java
@@ -977,7 +977,9 @@ private void runCommand() throws IOException {
       builder.environment().clear();
     }
 
-    builder.environment().putAll(this.environment);
+    if (!environment.isEmpty()) {
+      builder.environment().putAll(this.environment);
+    }
 
     if (dir != null) {
       builder.directory(this.dir);

Original file line number	Diff line number	Diff line change
`@@ -977,7 +977,9 @@ private void runCommand() throws IOException {`
`977`	`977`	`builder.environment().clear();`
`978`	`978`	`}`
`979`	`979`
`980`		`- builder.environment().putAll(this.environment);`
	`980`	`+ if (!environment.isEmpty()) {`
	`981`	`+ builder.environment().putAll(this.environment);`
	`982`	`+ }`
`981`	`983`
`982`	`984`	`if (dir != null) {`
`983`	`985`	`builder.directory(this.dir);`