Author: ltheussl
Date: Tue Jan 18 10:49:59 2011
New Revision: 1060297
URL: http://svn.apache.org/viewvc?rev=1060297&view=rev
Log:
avoid NPE if decoration == null
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=1060297&r1=1060296&r2=1060297&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
Tue Jan 18 10:49:59 2011
@@ -1269,8 +1269,11 @@ public class DefaultSiteTool
decoration = new DecorationModel();
}
- final String name = ( StringUtils.isEmpty( decoration.getName() ) ?
- project.getName() : decoration.getName() );
+ String name = project.getName();
+ if ( decoration != null && StringUtils.isNotEmpty(
decoration.getName() ) )
+ {
+ name = decoration.getName();
+ }
// Merge the parent and child site descriptors
assembler.assembleModelInheritance( name, decoration, parent,
project.getUrl(),
