Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

57063: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      56552: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
         56022: Merged DEV to V4.1-BUG-FIX (4.1.7)
            56020: MNT-9351: Error decoding facet value with SOLR / Repository on Windows
               Suggested fix from our Partner Axel Faust


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61696 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-11 19:08:47 +00:00
parent 79ea8599aa
commit cd19fd9493

View File

@@ -459,7 +459,7 @@ public class SolrQueryHTTPClient implements BeanFactoryAware
throw new LuceneQueryParserException("Request failed " + post.getStatusCode() + " " + url.toString()); throw new LuceneQueryParserException("Request failed " + post.getStatusCode() + " " + url.toString());
} }
Reader reader = new BufferedReader(new InputStreamReader(post.getResponseBodyAsStream())); Reader reader = new BufferedReader(new InputStreamReader(post.getResponseBodyAsStream(), post.getResponseCharSet()));
// TODO - replace with streaming-based solution e.g. SimpleJSON ContentHandler // TODO - replace with streaming-based solution e.g. SimpleJSON ContentHandler
JSONObject json = new JSONObject(new JSONTokener(reader)); JSONObject json = new JSONObject(new JSONTokener(reader));
SolrJSONResultSet results = new SolrJSONResultSet(json, searchParameters, nodeService, nodeDAO, limitBy, maxResults); SolrJSONResultSet results = new SolrJSONResultSet(json, searchParameters, nodeService, nodeDAO, limitBy, maxResults);