You are viewing a plain text version of this content. The canonical link for it is here.
Posted to doxia-commits@maven.apache.org by vs...@apache.org on 2008/11/07 20:41:28 UTC
svn commit: r712235 - in /maven/doxia/doxia/trunk/doxia-core/src:
main/java/org/apache/maven/doxia/parser/AbstractXmlParser.java
test/java/org/apache/maven/doxia/sink/SinkTestDocument.java
Author: vsiveton
Date: Fri Nov 7 11:41:28 2008
New Revision: 712235
URL: http://svn.apache.org/viewvc?rev=712235&view=rev
Log:
o revert r712146
o using StringReader instead of ByteArrayInputStream when validating xml
Modified:
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractXmlParser.java
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/SinkTestDocument.java
Modified: maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractXmlParser.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractXmlParser.java?rev=712235&r1=712234&r2=712235&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractXmlParser.java (original)
+++ maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractXmlParser.java Fri Nov 7 11:41:28 2008
@@ -534,7 +534,7 @@
{
getLog().debug( "Validating the content..." );
}
- getXmlReader().parse( new InputSource( new ByteArrayInputStream( content.getBytes() ) ) );
+ getXmlReader().parse( new InputSource( new StringReader( content ) ) );
}
}
catch ( IOException e )
Modified: maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/SinkTestDocument.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/SinkTestDocument.java?rev=712235&r1=712234&r2=712235&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/SinkTestDocument.java (original)
+++ maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/SinkTestDocument.java Fri Nov 7 11:41:28 2008
@@ -596,15 +596,7 @@
sink.paragraph_();
sink.paragraph();
- String copyright;
- try
- {
- copyright = new String( String.valueOf( '\u00a9' ).getBytes(), "UTF-8" );
- }
- catch ( UnsupportedEncodingException e )
- {
- copyright = "";
- }
+ String copyright = String.valueOf( '\u00a9' );
sink.text( "Copyright symbol: " + copyright + ", "
+ copyright + ", " + copyright + "." );
sink.paragraph_();