fixed NPE if useDefaultManifestFile has not been configured

Erwin Tratar · Erwin Tratar · commit ba2d2b568b98 · 2016-02-17T11:24:53.000+01:00
diff --git a/org.sonatype.m2e.mavenarchiver/src/org/sonatype/m2e/mavenarchiver/internal/AbstractMavenArchiverConfigurator.java b/org.sonatype.m2e.mavenarchiver/src/org/sonatype/m2e/mavenarchiver/internal/AbstractMavenArchiverConfigurator.java
@@ -431,7 +431,7 @@ private void reflectManifestGeneration(MavenProject mavenProject, MojoExecution
     Xpp3Dom customConfig = Xpp3DomUtils.mergeXpp3Dom(new Xpp3Dom("configuration"), originalConfig);
 
     Xpp3Dom useDefaultManifestFile = customConfig.getChild("useDefaultManifestFile");
-    if (Boolean.parseBoolean(useDefaultManifestFile.getValue()) && manifestFile.exists()) {
+    if (useDefaultManifestFile != null && Boolean.parseBoolean(useDefaultManifestFile.getValue()) && manifestFile.exists()) {
     	//<useDefaultManifestFile>true</useDefaultManifestFile> and Manifest exists -> don't overwrite
     	return;
     }

Original file line number	Diff line number	Diff line change
`@@ -431,7 +431,7 @@ private void reflectManifestGeneration(MavenProject mavenProject, MojoExecution`
`431`	`431`	`Xpp3Dom customConfig = Xpp3DomUtils.mergeXpp3Dom(new Xpp3Dom("configuration"), originalConfig);`
`432`	`432`
`433`	`433`	`Xpp3Dom useDefaultManifestFile = customConfig.getChild("useDefaultManifestFile");`
`434`		`- if (Boolean.parseBoolean(useDefaultManifestFile.getValue()) && manifestFile.exists()) {`
	`434`	`+ if (useDefaultManifestFile != null && Boolean.parseBoolean(useDefaultManifestFile.getValue()) && manifestFile.exists()) {`
`435`	`435`	`//<useDefaultManifestFile>true</useDefaultManifestFile> and Manifest exists -> don't overwrite`
`436`	`436`	`return;`
`437`	`437`	`}`