From a49963f10efc3b2dec62ebc84cff3720fdea45ba Mon Sep 17 00:00:00 2001
From: "Vladislav.Soroka" <Vladislav.Soroka@jetbrains.com>
Date: Wed, 18 Sep 2013 13:08:59 +0400
Subject: [PATCH] Gradle: vmOptions provisioning fix

---
 .../gradle/service/project/GradleExecutionHelper.java    | 8 +++++---
 .../plugins/gradle/service/task/GradleTaskManager.java   | 9 +++------
 2 files changed, 8 insertions(+), 9 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 a0b52be4e4c3..5e64616adf17 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
@@ -25,6 +25,7 @@ import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.util.ArrayUtilRt;
 import com.intellij.util.Function;
 import com.intellij.util.SystemProperties;
+import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.containers.ContainerUtilRt;
 import org.gradle.StartParameter;
 import org.gradle.tooling.*;
@@ -82,10 +83,11 @@ public class GradleExecutionHelper {
   public BuildLauncher getBuildLauncher(@NotNull final ExternalSystemTaskId id,
                                         @NotNull ProjectConnection connection,
                                         @Nullable GradleExecutionSettings settings,
-                                        @NotNull ExternalSystemTaskNotificationListener listener)
+                                        @NotNull ExternalSystemTaskNotificationListener listener,
+                                        @Nullable final String vmOptions)
   {
     BuildLauncher result = connection.newBuild();
-    prepare(result, id, settings, listener, Collections.<String>emptyList());
+    prepare(result, id, settings, listener, ContainerUtil.newArrayList(vmOptions == null ? "" : vmOptions.trim()));
     return result;
   }
 
@@ -191,7 +193,7 @@ public class GradleExecutionHelper {
     }
     ProjectConnection connection = getConnection(projectPath, settings);
     try {
-      BuildLauncher launcher = getBuildLauncher(id, connection, settings, listener);
+      BuildLauncher launcher = getBuildLauncher(id, connection, settings, listener, null);
       try {
         final File tempFile = FileUtil.createTempFile("wrap", ".gradle");
         tempFile.deleteOnExit();
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/task/GradleTaskManager.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/task/GradleTaskManager.java
index 43dd6a6a2fa1..d8a0cb0f4982 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/task/GradleTaskManager.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/task/GradleTaskManager.java
@@ -53,14 +53,14 @@ public class GradleTaskManager implements ExternalSystemTaskManager<GradleExecut
                            @Nullable final String debuggerSetup,
                            @NotNull final ExternalSystemTaskNotificationListener listener) throws ExternalSystemException {
 
-    //if(settings != null && settings.getDistributionType() == DistributionType.WRAPPED) {
+    if(settings != null) {
       myHelper.ensureInstalledWrapper(id, projectPath, settings, listener);
-    //}
+    }
 
     Function<ProjectConnection, Void> f = new Function<ProjectConnection, Void>() {
       @Override
       public Void fun(ProjectConnection connection) {
-        BuildLauncher launcher = myHelper.getBuildLauncher(id, connection, settings, listener);
+        BuildLauncher launcher = myHelper.getBuildLauncher(id, connection, settings, listener, vmOptions);
         if (!StringUtil.isEmpty(debuggerSetup)) {
           try {
             final File tempFile = FileUtil.createTempFile("init", ".gradle");
@@ -78,9 +78,6 @@ public class GradleTaskManager implements ExternalSystemTaskManager<GradleExecut
             throw new ExternalSystemException(e);
           }
         }
-        if (!StringUtil.isEmpty(vmOptions)) {
-          launcher.setJvmArguments(vmOptions.trim());
-        }
         launcher.forTasks(ArrayUtil.toStringArray(taskNames));
         launcher.run();
         return null;