honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix auto conversion from source content type to rest content type

This commit is contained in:
kimchy 2010-09-28 00:01:35 +02:00
parent f01f5ab323
commit 86e17eae2c
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/support/RestXContentBuilder.java
View File

@ -69,8 +69,7 @@ public class RestXContentBuilder {
if (contentType == builder.contentType()) { if (contentType == builder.contentType()) {
builder.rawField("_source", siLzf); builder.rawField("_source", siLzf);
} else { } else {
// TODO, should we just return it as binary and not auto convert it? XContentParser parser = XContentFactory.xContent(contentType).createParser(siLzf);
XContentParser parser = XContentFactory.xContent(builder.contentType()).createParser(siLzf);
try { try {
parser.nextToken(); parser.nextToken();
builder.field("_source"); builder.field("_source");
@ -80,11 +79,11 @@ public class RestXContentBuilder {
} }
} }
} else { } else {
if (XContentFactory.xContentType(source) == builder.contentType()) { XContentType contentType = XContentFactory.xContentType(source);
if (contentType == builder.contentType()) {
builder.rawField("_source", source); builder.rawField("_source", source);
} else { } else {
// TODO, should we just return it as binary and not auto convert it? XContentParser parser = XContentFactory.xContent(contentType).createParser(source);
XContentParser parser = XContentFactory.xContent(builder.contentType()).createParser(source);
try { try {
parser.nextToken(); parser.nextToken();
builder.field("_source"); builder.field("_source");