From 474b49db890e986170ce91655a80d65ea36c63ce Mon Sep 17 00:00:00 2001
From: "Vladislav.Soroka" <Vladislav.Soroka@jetbrains.com>
Date: Fri, 1 Dec 2017 18:23:35 +0300
Subject: [PATCH] External system: resolve JAVA_HOME env variable defined on
 Mac OS

---
 .../service/execution/ExternalSystemJdkUtil.java         | 5 +++--
 .../service/ui/ExternalSystemJdkComboBox.java            | 3 ++-
 .../idea/maven/execution/MavenExternalParameters.java    | 9 +++------
 .../jetbrains/idea/maven/server/MavenServerManager.java  | 3 ++-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/execution/ExternalSystemJdkUtil.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/execution/ExternalSystemJdkUtil.java
index 702e9c5eb391..14c608eace62 100644
--- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/execution/ExternalSystemJdkUtil.java
+++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/execution/ExternalSystemJdkUtil.java
@@ -25,6 +25,7 @@ import com.intellij.openapi.roots.ModuleRootManager;
 import com.intellij.openapi.roots.ProjectRootManager;
 import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.util.text.StringUtil;
+import com.intellij.util.EnvironmentUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -62,7 +63,7 @@ public class ExternalSystemJdkUtil {
     }
 
     if (USE_JAVA_HOME.equals(jdkName)) {
-      String javaHome = System.getenv("JAVA_HOME");
+      String javaHome = EnvironmentUtil.getEnvironmentMap().get("JAVA_HOME");
       if (StringUtil.isEmptyOrSpaces(javaHome)) throw new UndefinedJavaHomeException();
       if (!isValidJdk(javaHome)) throw new InvalidJavaHomeException(javaHome);
       return JavaSdk.getInstance().createJdk("", javaHome);
@@ -100,7 +101,7 @@ public class ExternalSystemJdkUtil {
     }
 
     if (!ApplicationManager.getApplication().isUnitTestMode()) {
-      String javaHome = System.getenv("JAVA_HOME");
+      String javaHome = EnvironmentUtil.getEnvironmentMap().get("JAVA_HOME");
       if (isValidJdk(javaHome)) {
         return Pair.create(USE_JAVA_HOME, JavaSdk.getInstance().createJdk("", javaHome));
       }
diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/ui/ExternalSystemJdkComboBox.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/ui/ExternalSystemJdkComboBox.java
index 2254d63bd57b..49d90dae3d0f 100644
--- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/ui/ExternalSystemJdkComboBox.java
+++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/ui/ExternalSystemJdkComboBox.java
@@ -36,6 +36,7 @@ import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.ui.ColoredListCellRenderer;
 import com.intellij.ui.JBColor;
 import com.intellij.ui.SimpleTextAttributes;
+import com.intellij.util.EnvironmentUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -237,7 +238,7 @@ public class ExternalSystemJdkComboBox extends ComboBoxWithWidePopup<ExternalSys
                  new JdkComboBoxItem(ExternalSystemJdkUtil.USE_PROJECT_JDK, "Use Project JDK", buildComment(projectSdk), true));
     }
 
-    String javaHomePath = System.getenv("JAVA_HOME");
+    String javaHomePath = EnvironmentUtil.getEnvironmentMap().get("JAVA_HOME");
     String javaHomeLabel = ExternalSystemBundle.message("external.system.java.home.env");
 
     result.put(ExternalSystemJdkUtil.USE_JAVA_HOME,
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenExternalParameters.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenExternalParameters.java
index a7832294e276..7f923223b0e0 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenExternalParameters.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenExternalParameters.java
@@ -45,6 +45,7 @@ import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.encoding.EncodingManager;
 import com.intellij.openapi.vfs.encoding.EncodingProjectManager;
+import com.intellij.util.EnvironmentUtil;
 import com.intellij.util.PathUtil;
 import com.intellij.util.io.ZipUtil;
 import org.jetbrains.annotations.NonNls;
@@ -349,15 +350,11 @@ public class MavenExternalParameters {
     }
 
     if (name.equals(MavenRunnerSettings.USE_JAVA_HOME)) {
-      final String javaHome = System.getenv("JAVA_HOME");
+      final String javaHome = EnvironmentUtil.getEnvironmentMap().get("JAVA_HOME");
       if (StringUtil.isEmptyOrSpaces(javaHome)) {
         throw new ExecutionException(RunnerBundle.message("maven.java.home.undefined"));
       }
-      final Sdk jdk = JavaSdk.getInstance().createJdk("", javaHome);
-      if (jdk == null) {
-        throw new ExecutionException(RunnerBundle.message("maven.java.home.invalid", javaHome));
-      }
-      return jdk;
+      return JavaSdk.getInstance().createJdk("", javaHome);
     }
 
     for (Sdk projectJdk : ProjectJdkTable.getInstance().getAllJdks()) {
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/server/MavenServerManager.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/server/MavenServerManager.java
index 20dfda5b474f..8004e108c7f7 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/server/MavenServerManager.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/server/MavenServerManager.java
@@ -44,6 +44,7 @@ import com.intellij.openapi.projectRoots.impl.JavaAwareProjectJdkTableImpl;
 import com.intellij.openapi.roots.ProjectRootManager;
 import com.intellij.openapi.util.SystemInfo;
 import com.intellij.openapi.util.text.StringUtil;
+import com.intellij.util.EnvironmentUtil;
 import com.intellij.util.PathUtil;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.xmlb.Converter;
@@ -217,7 +218,7 @@ public class MavenServerManager extends RemoteObjectWrapper<MavenServer> impleme
   @NotNull
   private Sdk getJdk() {
     if (myState.embedderJdk.equals(MavenRunnerSettings.USE_JAVA_HOME)) {
-      final String javaHome = System.getenv("JAVA_HOME");
+      final String javaHome = EnvironmentUtil.getEnvironmentMap().get("JAVA_HOME");
       if (!StringUtil.isEmptyOrSpaces(javaHome)) {
         return JavaSdk.getInstance().createJdk("", javaHome);
       }