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

@@ -180,7 +180,9 @@ public class MavenBuild extends AbstractBuild<MavenModule,MavenBuild> {
     @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;
     }
 

maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java

@@ -123,7 +123,9 @@ public final class MavenModuleSetBuild extends AbstractBuild<MavenModuleSet,Mave
     @Override
     public EnvVars getEnvironment(TaskListener log) throws IOException, InterruptedException {
         EnvVars envs = super.getEnvironment(log);
-        envs.put("MAVEN_OPTS",project.getMavenOpts());
+        String opts = project.getMavenOpts();
+        if(opts!=null)
+            envs.put("MAVEN_OPTS", opts);
         return envs;
     }