From 5567f629fb089788cf7191b4de03e0a35cd77665 Mon Sep 17 00:00:00 2001
From: Noble Paul <noble@apache.org>
Date: Wed, 5 Nov 2014 12:51:05 +0000
Subject: [PATCH] SOLR-6533

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1636863 13f79535-47bb-0310-9956-ffa450edef68
---
 solr/core/src/java/org/apache/solr/core/SolrConfig.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/solr/core/src/java/org/apache/solr/core/SolrConfig.java b/solr/core/src/java/org/apache/solr/core/SolrConfig.java
index 434259ffc54..2417fd7e75c 100644
--- a/solr/core/src/java/org/apache/solr/core/SolrConfig.java
+++ b/solr/core/src/java/org/apache/solr/core/SolrConfig.java
@@ -60,6 +60,7 @@ import java.io.FileFilter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.EnumSet;
@@ -341,7 +342,7 @@ public class SolrConfig extends Config implements MapSerializable{
       if (in instanceof ZkSolrResourceLoader.ZkByteArrayInputStream) {
         version = ((ZkSolrResourceLoader.ZkByteArrayInputStream) in).getStat().getVersion();
       }
-      Map m = (Map) ObjectBuilder.getVal(new JSONParser(new InputStreamReader(in)));
+      Map m = (Map) ObjectBuilder.getVal(new JSONParser(new InputStreamReader(in, StandardCharsets.UTF_8)));
       return new ConfigOverlay(m,version);
     } catch (Exception e) {
       throw new SolrException(ErrorCode.SERVER_ERROR,"Error reading config overlay",e);