Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

o Fixed potential NPE 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@803200 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Benjamin Bentmann 2009-08-11 16:37:41 +00:00
parent 16b9331f92
commit 87704b69b8
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
View File

@ -738,7 +738,8 @@ public class DefaultLifecycleExecutor
{
Xpp3Dom executionConfiguration = (Xpp3Dom) e.getConfiguration();
Xpp3Dom mojoConfiguration = new Xpp3Dom( executionConfiguration );
Xpp3Dom mojoConfiguration =
( executionConfiguration != null ) ? new Xpp3Dom( executionConfiguration ) : null;
mojoConfiguration = Xpp3Dom.mergeXpp3Dom( mojoExecution.getConfiguration(), mojoConfiguration );