From 4cf1b3ed9ee2a77c393f7fc5770015c8531f892c Mon Sep 17 00:00:00 2001
From: kimchy <kimchy@gmail.com>
Date: Tue, 23 Feb 2010 21:33:54 +0200
Subject: [PATCH] read settings (json, yml) using utf8

---
 .../main/java/org/elasticsearch/index/mapper/MapperService.java | 2 +-
 .../src/main/java/org/elasticsearch/util/io/Streams.java        | 2 +-
 .../java/org/elasticsearch/util/settings/ImmutableSettings.java | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/MapperService.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/MapperService.java
index 02e61b8ce07..e3db1a768ce 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/MapperService.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/MapperService.java
@@ -122,7 +122,7 @@ public class MapperService extends AbstractIndexComponent implements Iterable<Do
 
         if (dynamic) {
             try {
-                dynamicMappingSource = Streams.copyToString(new InputStreamReader(dynamicMappingUrl.openStream(), "UTF8"));
+                dynamicMappingSource = Streams.copyToString(new InputStreamReader(dynamicMappingUrl.openStream(), "UTF-8"));
             } catch (IOException e) {
                 throw new MapperException("Failed to load default mapping source from [" + dynamicMappingLocation + "]", e);
             }
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/io/Streams.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/io/Streams.java
index fc302ac4ed3..d140fba4500 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/io/Streams.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/io/Streams.java
@@ -253,7 +253,7 @@ public abstract class Streams {
         if (is == null) {
             throw new FileNotFoundException("Resource [" + path + "] not found in classpath with class loader [" + classLoader + "]");
         }
-        return copyToString(new InputStreamReader(is));
+        return copyToString(new InputStreamReader(is, "UTF-8"));
     }
 
     public static String copyToStringFromClasspath(String path) throws IOException {
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/util/settings/ImmutableSettings.java b/modules/elasticsearch/src/main/java/org/elasticsearch/util/settings/ImmutableSettings.java
index d3328760ba2..90b78739abb 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/util/settings/ImmutableSettings.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/util/settings/ImmutableSettings.java
@@ -487,7 +487,7 @@ public class ImmutableSettings implements Settings {
         public Builder loadFromStream(String resourceName, InputStream is) throws SettingsException {
             SettingsLoader settingsLoader = SettingsLoaderFactory.loaderFromResource(resourceName);
             try {
-                Map<String, String> loadedSettings = settingsLoader.load(Streams.copyToString(new InputStreamReader(is)));
+                Map<String, String> loadedSettings = settingsLoader.load(Streams.copyToString(new InputStreamReader(is, "UTF-8")));
                 putAll(loadedSettings);
             } catch (IOException e) {
                 throw new SettingsException("Failed to load settings from [" + resourceName + "]");