From 70f4568a3d4109db189a6815ff11964a91bfb042 Mon Sep 17 00:00:00 2001
From: Oliver Burn <oliver@puppycrawl.com>
Date: Wed, 19 Oct 2005 12:44:44 +0000
Subject: [PATCH] Fix encoding problems when parsing XML (patch 1320132)

---
 .../tools/checkstyle/PackageNamesLoader.java        | 13 ++++++-------
 .../checks/imports/ImportControlLoader.java         |  8 ++++----
 .../checkstyle/filters/SuppressionsLoader.java      |  8 ++++----
 src/xdocs/releasenotes.xml                          |  5 ++++-
 4 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/PackageNamesLoader.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/PackageNamesLoader.java
index 0e383aca4..df0270167 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/PackageNamesLoader.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/PackageNamesLoader.java
@@ -18,16 +18,15 @@
 ////////////////////////////////////////////////////////////////////////////////
 package com.puppycrawl.tools.checkstyle;
 
+import com.puppycrawl.tools.checkstyle.api.AbstractLoader;
+import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
+import java.io.FileInputStream;
 import java.io.FileNotFoundException;
-import java.io.FileReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Iterator;
 import java.util.Stack;
 import javax.xml.parsers.ParserConfigurationException;
-
-import com.puppycrawl.tools.checkstyle.api.AbstractLoader;
-import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
 import org.xml.sax.Attributes;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
@@ -157,15 +156,15 @@ public final class PackageNamesLoader
     public static ModuleFactory loadModuleFactory(String aFilename)
         throws CheckstyleException
     {
-        FileReader reader = null;
+        FileInputStream fis = null;
         try {
-            reader = new FileReader(aFilename);
+            fis = new FileInputStream(aFilename);
         }
         catch (FileNotFoundException e) {
             throw new CheckstyleException(
                 "unable to find " + aFilename, e);
         }
-        final InputSource source = new InputSource(reader);
+        final InputSource source = new InputSource(fis);
         return loadModuleFactory(source, aFilename);
     }
 
diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/imports/ImportControlLoader.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/imports/ImportControlLoader.java
index fef63fecc..1c8632eca 100755
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/imports/ImportControlLoader.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/imports/ImportControlLoader.java
@@ -20,8 +20,8 @@ package com.puppycrawl.tools.checkstyle.checks.imports;
 
 import com.puppycrawl.tools.checkstyle.api.AbstractLoader;
 import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
+import java.io.FileInputStream;
 import java.io.FileNotFoundException;
-import java.io.FileReader;
 import java.io.IOException;
 import java.util.Stack;
 import javax.xml.parsers.ParserConfigurationException;
@@ -115,14 +115,14 @@ final class ImportControlLoader extends AbstractLoader
      */
     static PkgControl load(final String aFilename) throws CheckstyleException
     {
-        FileReader reader = null;
+        FileInputStream fis = null;
         try {
-            reader = new FileReader(aFilename);
+            fis = new FileInputStream(aFilename);
         }
         catch (FileNotFoundException e) {
             throw new CheckstyleException("unable to find " + aFilename, e);
         }
-        final InputSource source = new InputSource(reader);
+        final InputSource source = new InputSource(fis);
         return load(source, aFilename);
     }
 
diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/filters/SuppressionsLoader.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/filters/SuppressionsLoader.java
index ff4c8fe74..8beb10ee0 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/filters/SuppressionsLoader.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/filters/SuppressionsLoader.java
@@ -21,8 +21,8 @@ package com.puppycrawl.tools.checkstyle.filters;
 import com.puppycrawl.tools.checkstyle.api.AbstractLoader;
 import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
 import com.puppycrawl.tools.checkstyle.api.FilterSet;
+import java.io.FileInputStream;
 import java.io.FileNotFoundException;
-import java.io.FileReader;
 import java.io.IOException;
 import java.util.regex.PatternSyntaxException;
 import javax.xml.parsers.ParserConfigurationException;
@@ -116,15 +116,15 @@ public final class SuppressionsLoader
     public static FilterSet loadSuppressions(String aFilename)
         throws CheckstyleException
     {
-        FileReader reader = null;
+        FileInputStream fis = null;
         try {
-            reader = new FileReader(aFilename);
+            fis = new FileInputStream(aFilename);
         }
         catch (FileNotFoundException e) {
             throw new CheckstyleException(
                 "unable to find " + aFilename, e);
         }
-        final InputSource source = new InputSource(reader);
+        final InputSource source = new InputSource(fis);
         return loadSuppressions(source, aFilename);
     }
 
diff --git a/src/xdocs/releasenotes.xml b/src/xdocs/releasenotes.xml
index d706327d3..194a064e8 100755
--- a/src/xdocs/releasenotes.xml
+++ b/src/xdocs/releasenotes.xml
@@ -41,7 +41,10 @@
       <p>Fixed Bugs:</p>
 
       <ul>
-        <li>TBD</li>
+        <li>
+	  Fixed encoding problems when parsing XML because was using
+	  FileReader instead of FileInputStream. Bug 1320132.
+	</li>
       </ul>
 
       <p>Other improvements:</p>