From 15b2a8b6b901734769a28ade1d777cf95c45b1e2 Mon Sep 17 00:00:00 2001
From: olivier lamy <olamy@apache.org>
Date: Mon, 5 Sep 2011 22:12:01 +0200
Subject: [PATCH]  fix run headless flag for maven build witn already existed
 MAVEN_OPTS

---
 .../hudson/maven/AbstractMavenProcessFactory.java    | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/maven-plugin/src/main/java/hudson/maven/AbstractMavenProcessFactory.java b/maven-plugin/src/main/java/hudson/maven/AbstractMavenProcessFactory.java
index c3ea0c2931..4e20fb42ca 100644
--- a/maven-plugin/src/main/java/hudson/maven/AbstractMavenProcessFactory.java
+++ b/maven-plugin/src/main/java/hudson/maven/AbstractMavenProcessFactory.java
@@ -255,7 +255,7 @@ public abstract class AbstractMavenProcessFactory
 
     public String getMavenOpts() {
         if( this.mavenOpts != null )
-            return this.mavenOpts;
+            return addRunHeadLessOption(this.mavenOpts);
 
         String mavenOpts = mms.getMavenOpts();
 
@@ -277,6 +277,13 @@ public abstract class AbstractMavenProcessFactory
             }
         }
 
+        mavenOpts = addRunHeadLessOption(mavenOpts);
+
+        return envVars.expand(mavenOpts);
+    }
+
+    protected String addRunHeadLessOption(String mavenOpts) {
+
         if (mms.runHeadless()) {
             // Configure headless process
             if (mavenOpts == null) {
@@ -292,8 +299,7 @@ public abstract class AbstractMavenProcessFactory
                 // TODO mavenOpts += " -Xdock:name=Jenkins -Xdock:icon=jenkins.png";
             }
         }
-
-        return envVars.expand(mavenOpts);
+        return mavenOpts;
     }
 
 
-- 
GitLab