svn commit: r418889 - /maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java

[kenney]

Author: kenney
Date: Mon Jul  3 18:03:46 2006
New Revision: 418889

URL: http://svn.apache.org/viewvc?rev=418889&view=rev
Log:
PR: MSITE-154

Sometimes parent site.xml is not resolved. This occurs when
either the current project or the parent doesn't have an <url>.

Removed check for URL and use current URL if parent URL not specified.
Tested with both URLs set to null - no NPE occurred.

Modified:
    
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java

Modified: 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java?rev=418889&r1=418888&r2=418889&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
 Mon Jul  3 18:03:46 2006
@@ -210,7 +210,7 @@
         }
 
         MavenProject parentProject = getParentProject( project );
-        if ( parentProject != null && project.getUrl() != null && 
parentProject.getUrl() != null )
+        if ( parentProject != null )
         {
             DecorationModel parent = getDecorationModel( parentProject, 
locale, props );
 
@@ -221,7 +221,7 @@
             else
             {
                 assembler.assembleModelInheritance( project.getName(), 
decoration, parent, project.getUrl(),
-                                                    parentProject.getUrl() );
+                                                    parentProject.getUrl() == 
null ? project.getUrl() : parentProject.getUrl() );
             }
             if ( decoration != null )
             {