From b4628d4c5025743f0357d15bdf0ee0856e834484 Mon Sep 17 00:00:00 2001
From: Sergey Evdokimov <sergey.evdokimov@jetbrains.com>
Date: Thu, 14 Feb 2013 19:09:47 +0400
Subject: [PATCH] IDEA-101087 IntelliJ IDEA does not override MAVEN_OPTS when
 VM parameters for Maven runner are specified

---
 .../idea/maven/execution/MavenExternalParameters.java         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 8aead889ac27..dff5a8759e83 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
@@ -173,10 +173,10 @@ public class MavenExternalParameters {
   }
 
   public static void addVMParameters(ParametersList parametersList, String mavenHome, MavenRunnerSettings runnerSettings) {
-    parametersList.addParametersString(runnerSettings.getVmOptions());
-
     parametersList.addParametersString(System.getenv(MAVEN_OPTS));
 
+    parametersList.addParametersString(runnerSettings.getVmOptions());
+
     parametersList.addProperty("classworlds.conf", MavenUtil.getMavenConfFile(new File(mavenHome)).getPath());
 
     parametersList.addProperty("maven.home", mavenHome);