From 5265cb691199c367e130b2b2569c00bb02086def Mon Sep 17 00:00:00 2001
From: "Vladislav.Soroka" <Vladislav.Soroka@jetbrains.com>
Date: Fri, 17 Jul 2015 17:52:38 +0300
Subject: [PATCH] gradle: do not merge jvm args with gradle
 JvmOptions#getAllJvmArgs

---
 .../service/project/GradleExecutionHelper.java     | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleExecutionHelper.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleExecutionHelper.java
index 9693ae67df19..f5ad42622f87 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleExecutionHelper.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleExecutionHelper.java
@@ -29,7 +29,6 @@ import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.util.*;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.containers.ContainerUtilRt;
-import org.gradle.process.internal.JvmOptions;
 import org.gradle.tooling.*;
 import org.gradle.tooling.internal.consumer.DefaultExecutorServiceFactory;
 import org.gradle.tooling.internal.consumer.DefaultGradleConnector;
@@ -50,7 +49,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.lang.reflect.Field;
-import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
@@ -134,12 +132,8 @@ public class GradleExecutionHelper {
     jvmArgs.addAll(extraJvmArgs);
 
     if (!jvmArgs.isEmpty()) {
-      BuildEnvironment buildEnvironment = getBuildEnvironment(connection);
-      Collection<String> merged =
-        buildEnvironment != null ? mergeJvmArgs(buildEnvironment.getJava().getJvmArguments(), jvmArgs) : jvmArgs;
-
       // filter nulls and empty strings
-      List<String> filteredArgs = ContainerUtil.mapNotNull(merged, new Function<String, String>() {
+      List<String> filteredArgs = ContainerUtil.mapNotNull(jvmArgs, new Function<String, String>() {
         @Override
         public String fun(String s) {
           return StringUtil.isEmpty(s) ? null : s;
@@ -290,12 +284,6 @@ public class GradleExecutionHelper {
     }
   }
 
-  private static List<String> mergeJvmArgs(Iterable<String> jvmArgs1, Iterable<String> jvmArgs2) {
-    JvmOptions jvmOptions = new JvmOptions(null);
-    jvmOptions.setAllJvmArgs(ContainerUtil.concat(jvmArgs1, jvmArgs2));
-    return jvmOptions.getAllJvmArgs();
-  }
-
   /**
    * Allows to retrieve gradle api connection to use for the given project.
    *