svn commit: r803200 - /maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java

[bentmann]

Author: bentmann
Date: Tue Aug 11 16:37:41 2009
New Revision: 803200

URL: http://svn.apache.org/viewvc?rev=803200&view=rev
Log:
o Fixed potential NPE

Modified:
    
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java

Modified: 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java?rev=803200&r1=803199&r2=803200&view=diff
==============================================================================
--- 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
 (original)
+++ 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
 Tue Aug 11 16:37:41 2009
@@ -738,7 +738,8 @@
                 {
                     Xpp3Dom executionConfiguration = (Xpp3Dom) 
e.getConfiguration();
 
-                    Xpp3Dom mojoConfiguration = new Xpp3Dom( 
executionConfiguration );
+                    Xpp3Dom mojoConfiguration =
+                        ( executionConfiguration != null ) ? new Xpp3Dom( 
executionConfiguration ) : null;
 
                     mojoConfiguration = Xpp3Dom.mergeXpp3Dom( 
mojoExecution.getConfiguration(), mojoConfiguration );