From 4ac8e27562c824b8fa5e344a5e43f77314b82943 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Tue, 7 Jul 2009 18:36:09 +0000 Subject: [PATCH] fixed NPE later down the road git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@19473 71c3de6d-444a-0410-be80-ed276b4c234a --- maven-plugin/src/main/java/hudson/maven/MavenBuild.java | 4 +++- .../src/main/java/hudson/maven/MavenModuleSetBuild.java | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/maven-plugin/src/main/java/hudson/maven/MavenBuild.java b/maven-plugin/src/main/java/hudson/maven/MavenBuild.java index 0868df55c2..d5efe611a7 100644 --- a/maven-plugin/src/main/java/hudson/maven/MavenBuild.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenBuild.java @@ -180,7 +180,9 @@ public class MavenBuild extends AbstractBuild { @Override public EnvVars getEnvironment(TaskListener log) throws IOException, InterruptedException { EnvVars envs = super.getEnvironment(log); - envs.put("MAVEN_OPTS",project.getParent().getMavenOpts()); + String opts = project.getMavenOpts(); + if(opts!=null) + envs.put("MAVEN_OPTS", opts); return envs; } diff --git a/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java b/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java index f4e1609e14..41bcca4459 100644 --- a/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java @@ -123,7 +123,9 @@ public final class MavenModuleSetBuild extends AbstractBuild