maven-doxia-commits mailing list archives

Author: vsiveton
Date: Wed May 14 17:42:26 2008
New Revision: 656475

URL: http://svn.apache.org/viewvc?rev=656475&view=rev
Log:
DOXIA-240: NPE when building documentation

o moved the init of macroParameters to the <macro/> tag init

Modified:
    maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocParser.java

Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocParser.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocParser.java?rev=656475&r1=656474&r2=656475&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocParser.java
(original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocParser.java
Wed May 14 17:42:26 2008
@@ -174,6 +174,11 @@
             {
                 macroName = parser.getAttributeValue( null, Attribute.NAME.toString() );
 
+                if ( macroParameters == null )
+                {
+                    macroParameters = new HashMap();
+                }
+
                 if ( StringUtils.isEmpty( macroName ) )
                 {
                     throw new MacroExecutionException( "The '" + Attribute.NAME.toString()
+ "' attribute for the '"
@@ -187,11 +192,6 @@
             {
                 if ( StringUtils.isNotEmpty( macroName ) )
                 {
-                    if ( macroParameters == null )
-                    {
-                        macroParameters = new HashMap();
-                    }
-
                     String paramName = parser.getAttributeValue( null, Attribute.NAME.toString()
);
                     String paramValue = parser.getAttributeValue( null, Attribute.VALUE.toString()
);