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

[hboutemy]

Author: hboutemy
Date: Sun Sep 20 07:45:25 2015
New Revision: 1704105

URL: http://svn.apache.org/viewvc?rev=1704105&view=rev
Log:
merge ifs

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=1704105&r1=1704104&r2=1704105&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
 Sun Sep 20 07:45:25 2015
@@ -382,21 +382,18 @@ public class XdocParser
     private void handleMacroEnd( Sink sink )
         throws MacroExecutionException
     {
-        if ( !isSecondParsing() )
+        if ( !isSecondParsing() && StringUtils.isNotEmpty( macroName ) )
         {
-            if ( StringUtils.isNotEmpty( macroName ) )
-            {
-                MacroRequest request =
-                    new MacroRequest( sourceContent, new XdocParser(), 
macroParameters, getBasedir() );
+            MacroRequest request =
+                new MacroRequest( sourceContent, new XdocParser(), 
macroParameters, getBasedir() );
 
-                try
-                {
-                    executeMacro( macroName, request, sink );
-                }
-                catch ( MacroNotFoundException me )
-                {
-                    throw new MacroExecutionException( "Macro not found: " + 
macroName, me );
-                }
+            try
+            {
+                executeMacro( macroName, request, sink );
+            }
+            catch ( MacroNotFoundException me )
+            {
+                throw new MacroExecutionException( "Macro not found: " + 
macroName, me );
             }
         }