You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2016/06/16 13:46:24 UTC
[4/8] lucene-solr:branch_5_5: SOLR-8902: don't try to pull return
fields from the ResultContext - this method, added in SOLR-7957,
won't be backported to 5.x
SOLR-8902: don't try to pull return fields from the ResultContext - this method, added in SOLR-7957, won't be backported to 5.x
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/489f386b
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/489f386b
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/489f386b
Branch: refs/heads/branch_5_5
Commit: 489f386b766882d717d1bf5f740b81c179084d0e
Parents: e9e55d1
Author: Steve Rowe <sa...@apache.org>
Authored: Wed Jun 15 19:20:05 2016 -0400
Committer: Steve Rowe <sa...@apache.org>
Committed: Wed Jun 15 19:20:05 2016 -0400
----------------------------------------------------------------------
.../java/org/apache/solr/response/BinaryResponseWriter.java | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/489f386b/solr/core/src/java/org/apache/solr/response/BinaryResponseWriter.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/response/BinaryResponseWriter.java b/solr/core/src/java/org/apache/solr/response/BinaryResponseWriter.java
index 0e71333..25883d9 100644
--- a/solr/core/src/java/org/apache/solr/response/BinaryResponseWriter.java
+++ b/solr/core/src/java/org/apache/solr/response/BinaryResponseWriter.java
@@ -83,13 +83,7 @@ public class BinaryResponseWriter implements BinaryQueryResponseWriter {
@Override
public Object resolve(Object o, JavaBinCodec codec) throws IOException {
if (o instanceof ResultContext) {
- ReturnFields orig = returnFields;
- ResultContext res = (ResultContext)o;
- if(res.getReturnFields()!=null) {
- returnFields = res.getReturnFields();
- }
- writeResults(res, codec);
- returnFields = orig;
+ writeResults((ResultContext) o, codec);
return null; // null means we completely handled it
}
if (o instanceof DocList) {