[spark] branch master updated: [SPARK-33835][CORE] Refector AbstractCommandBuilder.buildJavaCommand: use firstNonEmpty

[srowen]

This is an automated email from the ASF dual-hosted git repository.

srowen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/spark.git


The following commit(s) were added to refs/heads/master by this push:
     new 61881bb  [SPARK-33835][CORE] Refector 
AbstractCommandBuilder.buildJavaCommand: use firstNonEmpty
61881bb is described below

commit 61881bb6988aa0320b4bacfabbc0ee6f05f287cb
Author: offthewall123 <dingyu...@intel.com>
AuthorDate: Wed Dec 23 20:01:53 2020 -0600

    [SPARK-33835][CORE] Refector AbstractCommandBuilder.buildJavaCommand: use 
firstNonEmpty
    
    ### What changes were proposed in this pull request?
    refector AbstractCommandBuilder.buildJavaCommand: use firstNonEmpty
    
    ### Why are the changes needed?
    For better code understanding, and firstNonEmpty can detect javaHome = "   
", an empty string.
    
    ### Does this PR introduce _any_ user-facing change?
    No
    
    ### How was this patch tested?
    End to End.
    
    Closes #30831 from offthewall123/refector_AbstractCommandBuilder.
    
    Authored-by: offthewall123 <dingyu...@intel.com>
    Signed-off-by: Sean Owen <sro...@gmail.com>
---
 .../org/apache/spark/launcher/AbstractCommandBuilder.java  | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git 
a/launcher/src/main/java/org/apache/spark/launcher/AbstractCommandBuilder.java 
b/launcher/src/main/java/org/apache/spark/launcher/AbstractCommandBuilder.java
index 778fd46..24ad9cb 100644
--- 
a/launcher/src/main/java/org/apache/spark/launcher/AbstractCommandBuilder.java
+++ 
b/launcher/src/main/java/org/apache/spark/launcher/AbstractCommandBuilder.java
@@ -92,17 +92,13 @@ abstract class AbstractCommandBuilder {
   List<String> buildJavaCommand(String extraClassPath) throws IOException {
     List<String> cmd = new ArrayList<>();
 
-    String[] candidateJavaHomes = new String[] {
-      javaHome,
+    String firstJavaHome = firstNonEmpty(javaHome,
       childEnv.get("JAVA_HOME"),
       System.getenv("JAVA_HOME"),
-      System.getProperty("java.home")
-    };
-    for (String javaHome : candidateJavaHomes) {
-      if (javaHome != null) {
-        cmd.add(join(File.separator, javaHome, "bin", "java"));
-        break;
-      }
+      System.getProperty("java.home"));
+
+    if (firstJavaHome != null) {
+      cmd.add(join(File.separator, firstJavaHome, "bin", "java"));
     }
 
     // Load extra JAVA_OPTS from conf/java-opts, if it exists.


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org