Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-6533 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1636863 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Noble Paul 2014-11-05 12:51:05 +00:00
parent 30db71bbde
commit 5567f629fb
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
solr/core/src/java/org/apache/solr/core/SolrConfig.java
View File

@ -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);