svn commit: r1704104 - in /maven/doxia/doxia/trunk/doxia-modules: doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocParser.java doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlParser.java

[hboutemy]

Author: hboutemy
Date: Sun Sep 20 07:39:37 2015
New Revision: 1704104

URL: http://svn.apache.org/viewvc?rev=1704104&view=rev
Log:
make xhtml and xdoc code about sourceContent for macro similar

Modified:
    
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocParser.java
    
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlParser.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=1704104&r1=1704103&r2=1704104&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:39:37 2015
@@ -93,7 +93,6 @@ public class XdocParser
         throws ParseException
     {
         this.sourceContent = null;
-        init();
 
         try
         {
@@ -110,21 +109,16 @@ public class XdocParser
             IOUtil.close( source );
         }
 
-        Reader tmp = new StringReader( sourceContent );
-
         // leave this at default (false) until everything is properly 
implemented, see DOXIA-226
         //setIgnorableWhitespace( true );
 
         try
         {
-            super.parse( tmp, sink );
+            super.parse( new StringReader( sourceContent ), sink );
         }
         finally
         {
             this.sourceContent = null;
-
-            setSecondParsing( false );
-            init();
         }
     }
 

Modified: 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlParser.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlParser.java?rev=1704104&r1=1704103&r2=1704104&view=diff
==============================================================================
--- 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlParser.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlParser.java
 Sun Sep 20 07:39:37 2015
@@ -60,7 +60,9 @@ public class XhtmlParser
     /** Empty elements don't write a closing tag. */
     private boolean isEmptyElement;
 
-    /** The source content of the input reader. Used to pass into macros. */
+    /**
+     * The source content of the input reader. Used to pass into macros.
+     */
     private String sourceContent;
 
     /** {@inheritDoc} */
@@ -337,12 +339,12 @@ public class XhtmlParser
         throws ParseException
     {
         this.sourceContent = null;
+
         try
         {
             StringWriter contentWriter = new StringWriter();
             IOUtil.copy( source, contentWriter );
             sourceContent = contentWriter.toString();
-            super.parse( new StringReader( sourceContent ), sink );
         }
         catch ( IOException ex )
         {
@@ -350,6 +352,15 @@ public class XhtmlParser
         }
         finally
         {
+            IOUtil.close( source );
+        }
+
+        try
+        {
+            super.parse( new StringReader( sourceContent ), sink );
+        }
+        finally
+        {
             this.sourceContent = null;
         }
     }