svn commit: r1604427 - /maven/doxia/doxia-tools/trunk/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java

[hb...@apache.org]

Author: hboutemy
Date: Sat Jun 21 15:51:53 2014
New Revision: 1604427

URL: http://svn.apache.org/r1604427
Log:
fix when decoration is null

Modified:
    maven/doxia/doxia-tools/trunk/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java

Modified: maven/doxia/doxia-tools/trunk/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java?rev=1604427&r1=1604426&r2=1604427&view=diff
==============================================================================
--- maven/doxia/doxia-tools/trunk/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java (original)
+++ maven/doxia/doxia-tools/trunk/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java Sat Jun 21 15:51:53 2014
@@ -1080,7 +1080,7 @@ public class DefaultSiteTool
             decoration.setLastModified( siteDescriptorLastModified );
         }
 
-        if ( parentProject != null && decoration.isMergeParent() )
+        if ( parentProject != null && ( decoration == null || decoration.isMergeParent() ) )
         {
             getLogger().debug( "Loading parent project site descriptor..." );
 
@@ -1092,7 +1092,7 @@ public class DefaultSiteTool
 
             // MSHARED-116 requires an empty decoration model (instead of a null one)
             // MSHARED-145 requires us to do this only if there is a parent to merge it with
-            if ( decoration == null && parent != null )
+            if ( decoration == null )
             {
                 // we have no site descriptor: merge the parent into an empty one
                 decoration = new DecorationModel();