Changeset 6995 in josm for trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java

Timestamp:

2014-04-23T02:30:39+02:00 (10 years ago)

Author:

Don-vip

Message:

fix #9906 - fix reliance on default encoding

File:

• trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java

@@ -10 +10 @@
 import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileReader;
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
@@ -227 +227 @@
                 // Try lsb_release (only available on LSB-compliant Linux systems, see https://www.linuxbase.org/lsb-cert/productdir.php?by_prod )
                 Process p = Runtime.getRuntime().exec("lsb_release -ds");
-                BufferedReader input = new BufferedReader(new InputStreamReader(p.getInputStream()));
+                BufferedReader input = new BufferedReader(new InputStreamReader(p.getInputStream(), Utils.UTF_8));
                 String line = Utils.strip(input.readLine());
                 Utils.close(input);
@@ -312 +312 @@
                     BufferedReader reader = null;
                     try {
-                        reader = new BufferedReader(new FileReader(file));
+                        reader = new BufferedReader(new InputStreamReader(new FileInputStream(file), Utils.UTF_8));
                         String id = null;
                         String release = null;