[FIXED HUDSON-5651] Removing excess whitespace from MAVEN_OPTS

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@27559 71c3de6d-444a-0410-be80-ed276b4c234a
This commit is contained in:
abayer committed 2010-02-16 15:40:20 +00:00
1 parent 1f055074b7
commit 37183f4c86
4 files changed
+28 -4

No files matched your search

@@ -622,10 +622,16 @@ public final class MavenModuleSet extends AbstractMavenProject<MavenModuleSet,Ma
*/
public String getMavenOpts() {
if ((mavenOpts!=null) && (mavenOpts.trim().length()>0)) {
return mavenOpts;
return mavenOpts.replaceAll("[\t\r\n]+"," ");
}
else {
return DESCRIPTOR.getGlobalMavenOpts();
String globalOpts = DESCRIPTOR.getGlobalMavenOpts();
if (globalOpts!=null) {
return globalOpts.replaceAll("[\t\r\n]+"," ");
}
else {
return globalOpts;
}
}
}