lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From no...@apache.org
Subject svn commit: r1636863 - /lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrConfig.java
Date Wed, 05 Nov 2014 12:51:05 GMT
Author: noble
Date: Wed Nov  5 12:51:05 2014
New Revision: 1636863

URL: http://svn.apache.org/r1636863
Log:
SOLR-6533

Modified:
    lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrConfig.java

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrConfig.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrConfig.java?rev=1636863&r1=1636862&r2=1636863&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrConfig.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrConfig.java Wed Nov  5 12:51:05
2014
@@ -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 i
       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);



Mime
View raw message