Fixes#163: Regression: encoding error when parsing a ISO-8859-1 xml (#164)

- Fixed code. - Added tests.

Author: belingueres

src/main/java/org/codehaus/plexus/util/xml/pull/MXParser.java

@@ -16,6 +16,7 @@
 importjava.io.UnsupportedEncodingException;
 
 importorg.codehaus.plexus.util.ReaderFactory;
+importorg.codehaus.plexus.util.xml.XmlReader;
 
 //import java.util.Hashtable;
 
@@ -663,7 +664,12 @@ public void setInput( Reader in )
 reset();
 reader = in;
 
-if ( readerinstanceofInputStreamReader )
+if ( readerinstanceofXmlReader ){
+// encoding already detected
+XmlReaderxsr = (XmlReader) reader;
+fileEncoding = xsr.getEncoding();
+ }
+elseif ( readerinstanceofInputStreamReader )
 {
 InputStreamReaderisr = (InputStreamReader) reader;
 if ( isr.getEncoding() != null )

src/test/java/org/codehaus/plexus/util/xml/pull/MXParserTest.java

@@ -21,9 +21,15 @@
 importstaticorg.junit.Assert.fail;
 
 importjava.io.EOFException;
+importjava.io.File;
 importjava.io.IOException;
+importjava.io.InputStream;
+importjava.io.Reader;
 importjava.io.StringReader;
+importjava.nio.file.Files;
+importjava.nio.file.Paths;
 
+importorg.codehaus.plexus.util.ReaderFactory;
 importorg.junit.Test;
 
 /**
@@ -840,4 +846,56 @@ public void testXMLDeclVersionEncodingStandaloneNoSpace()
  }
  }
 
+/**
+ * Issue 163: https://github.com/codehaus-plexus/plexus-utils/issues/163
+ *
+ * @throws IOException if IO error.
+ *
+ * @since 3.4.1
+ */
+@Test
+publicvoidtestEncodingISO_8859_1setInputReader()
+throwsIOException
+{
+try ( Readerreader =
+ReaderFactory.newXmlReader( newFile( "src/test/resources/xml", "test-encoding-ISO-8859-1.xml" ) ) )
+{
+MXParserparser = newMXParser();
+parser.setInput( reader );
+while ( parser.nextToken() != XmlPullParser.END_DOCUMENT )
+ ;
+assertTrue( true );
+ }
+catch ( XmlPullParserExceptione )
+{
+fail( "should not raise exception: " + e );
+ }
+ }
+
+/**
+ * Issue 163: https://github.com/codehaus-plexus/plexus-utils/issues/163
+ *
+ * @throws IOException if IO error.
+ *
+ * @since 3.4.1
+ */
+@Test
+publicvoidtestEncodingISO_8859_1_setInputStream()
+throwsIOException
+{
+try ( InputStreaminput =
+Files.newInputStream( Paths.get( "src/test/resources/xml", "test-encoding-ISO-8859-1.xml" ) ) )
+{
+MXParserparser = newMXParser();
+parser.setInput( input, null );
+while ( parser.nextToken() != XmlPullParser.END_DOCUMENT )
+ ;
+assertTrue( true );
+ }
+catch ( XmlPullParserExceptione )
+{
+fail( "should not raise exception: " + e );
+ }
+ }
+
 }