From 71fe398873555676e87d09594b5b2006e5fb4a01 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Tue, 29 Jan 2013 14:00:06 -0800 Subject: [PATCH] Let XML parser determine character encoding from header. --- .../net/basic/BasicFileAuthenticationProvider.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/BasicFileAuthenticationProvider.java b/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/BasicFileAuthenticationProvider.java index 10290762c..8078bf807 100644 --- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/BasicFileAuthenticationProvider.java +++ b/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/BasicFileAuthenticationProvider.java @@ -19,11 +19,11 @@ package net.sourceforge.guacamole.net.basic; * along with this program. If not, see . */ -import java.io.BufferedReader; +import java.io.BufferedInputStream; import java.io.File; -import java.io.FileReader; +import java.io.FileInputStream; import java.io.IOException; -import java.io.Reader; +import java.io.InputStream; import java.util.Map; import net.sourceforge.guacamole.GuacamoleException; import net.sourceforge.guacamole.net.auth.Credentials; @@ -113,9 +113,9 @@ public class BasicFileAuthenticationProvider extends SimpleAuthenticationProvide parser.setContentHandler(contentHandler); // Read and parse file - Reader reader = new BufferedReader(new FileReader(user_mapping_file)); - parser.parse(new InputSource(reader)); - reader.close(); + InputStream input = new BufferedInputStream(new FileInputStream(user_mapping_file)); + parser.parse(new InputSource(input)); + input.close(); // Store mod time and user mapping mod_time = user_mapping_file.lastModified();