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

[de...@apache.org]

Author: dennisl
Date: Fri Mar  5 22:05:03 2010
New Revision: 919641

URL: http://svn.apache.org/viewvc?rev=919641&view=rev
Log:
[MSHARED-145] The default-site.xml is not used if both parent and child are missing site.xml files

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

Modified: maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java?rev=919641&r1=919640&r2=919641&view=diff
==============================================================================
--- maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java (original)
+++ maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java Fri Mar  5 22:05:03 2010
@@ -1257,12 +1257,14 @@
             DecorationModel parent = getDecorationModel( parentProject, reactorProjects, localRepository, repositories,
                                                          siteDirectory, locale, props, inputEncoding, outputEncoding );
 
-            if ( decoration == null )
+            // 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 )
             {
                 // we have no site descriptor: merge the parent into an empty one
                 decoration = new DecorationModel();
             }
-
+            // Merge the parent and child site descriptors
             assembler.assembleModelInheritance( project.getName(), decoration, parent, project.getUrl(),
                         parentProject.getUrl() == null ? project.getUrl() : parentProject.getUrl() );
         }