You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by no...@apache.org on 2018/10/09 12:17:23 UTC
lucene-solr:master: SOLR-12843: precommit errors
Repository: lucene-solr
Updated Branches:
refs/heads/master a37a21397 -> a52d47a1a
SOLR-12843: precommit errors
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/a52d47a1
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/a52d47a1
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/a52d47a1
Branch: refs/heads/master
Commit: a52d47a1a5ca24bf090105388743a07ec985b399
Parents: a37a213
Author: Noble Paul <no...@apache.org>
Authored: Tue Oct 9 23:16:15 2018 +1100
Committer: Noble Paul <no...@apache.org>
Committed: Tue Oct 9 23:17:09 2018 +1100
----------------------------------------------------------------------
.../solr/client/solrj/request/MultiContentWriterRequest.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a52d47a1/solr/solrj/src/java/org/apache/solr/client/solrj/request/MultiContentWriterRequest.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/request/MultiContentWriterRequest.java b/solr/solrj/src/java/org/apache/solr/client/solrj/request/MultiContentWriterRequest.java
index 1a206b8..54a1842 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/request/MultiContentWriterRequest.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/request/MultiContentWriterRequest.java
@@ -33,6 +33,7 @@ import org.apache.solr.common.util.JavaBinCodec;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.Pair;
+import static java.nio.charset.StandardCharsets.UTF_8;
import static org.apache.solr.common.params.UpdateParams.ASSUME_CONTENT_TYPE;
public class MultiContentWriterRequest extends AbstractUpdateRequest {
@@ -92,7 +93,7 @@ public class MultiContentWriterRequest extends AbstractUpdateRequest {
byte[] bytes = null;
if (o instanceof byte[]) bytes = (byte[]) o;
else if (o instanceof ByteBuffer) bytes = ((ByteBuffer) o).array();
- rdr = new InputStreamReader(new ByteArrayInputStream(bytes));
+ rdr = new InputStreamReader(new ByteArrayInputStream(bytes), UTF_8);
String detectedContentType = null;
for (;;) {
int ch = rdr.read();