From 2625e99d8d64107fe1e2d0d34df4679740748c52 Mon Sep 17 00:00:00 2001
From: zhangbutao <zhangbutao@cmss.chinamobile.com>
Date: Thu, 10 Oct 2024 03:10:04 -0400
Subject: [PATCH] HADOOP-19305: Fix ProcessEnvironment ClassCastException in
 Shell.java

---
 .../src/main/java/org/apache/hadoop/util/Shell.java           | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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
index e0d199ea86372..c53ddc0725ca2 100644
--- 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);