You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by cp...@apache.org on 2016/01/12 22:03:25 UTC
svn commit: r1724321 - in /lucene/dev/branches/branch_5x: ./ solr/
solr/CHANGES.txt solr/core/ solr/core/src/java/org/apache/solr/search/
solr/core/src/java/org/apache/solr/search/XmlQParserPlugin.java
Author: cpoerschke
Date: Tue Jan 12 21:03:25 2016
New Revision: 1724321
URL: http://svn.apache.org/viewvc?rev=1724321&view=rev
Log:
SOLR-839: in XmlQParserPlugin replace "UTF8" with StandardCharsets.UTF_8 as suggested by LUCENE-5560. (merge in revision 1724318 from trunk)
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/solr/ (props changed)
lucene/dev/branches/branch_5x/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_5x/solr/core/ (props changed)
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/ (props changed)
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/XmlQParserPlugin.java
Modified: lucene/dev/branches/branch_5x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/CHANGES.txt?rev=1724321&r1=1724320&r2=1724321&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/solr/CHANGES.txt Tue Jan 12 21:03:25 2016
@@ -101,7 +101,7 @@ New Features
</BooleanQuery>
</Clause>
</BooleanQuery>
- (Erik Hatcher, Karl Wettin, Daniel Collins, Nathan Visagan, Christine Poerschke)
+ (Erik Hatcher, Karl Wettin, Daniel Collins, Nathan Visagan, Ahmet Arslan, Christine Poerschke)
Bug Fixes
----------------------
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/XmlQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/XmlQParserPlugin.java?rev=1724321&r1=1724320&r2=1724321&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/XmlQParserPlugin.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/XmlQParserPlugin.java Tue Jan 12 21:03:25 2016
@@ -18,7 +18,7 @@ package org.apache.solr.search;
*/
import java.io.ByteArrayInputStream;
-import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.queryparser.xml.ParserException;
@@ -35,8 +35,6 @@ public class XmlQParserPlugin extends QP
private class XmlQParser extends QParser {
- private final String contentEncoding = "UTF8";
-
public XmlQParser(String qstr, SolrParams localParams,
SolrParams params, SolrQueryRequest req) {
super(qstr, localParams, params, req);
@@ -52,9 +50,7 @@ public class XmlQParserPlugin extends QP
final Analyzer analyzer = schema.getQueryAnalyzer();
final SolrCoreParser solrParser = new SolrCoreParser(defaultField, analyzer, req);
try {
- return solrParser.parse(new ByteArrayInputStream(qstr.getBytes(contentEncoding)));
- } catch (UnsupportedEncodingException e) {
- throw new SyntaxError(e.getMessage() + " in " + req.toString());
+ return solrParser.parse(new ByteArrayInputStream(qstr.getBytes(StandardCharsets.UTF_8)));
} catch (ParserException e) {
throw new SyntaxError(e.getMessage() + " in " + req.toString());
}