You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ho...@apache.org on 2010/06/03 02:03:26 UTC
svn commit: r950831 - in
/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/response: ./
BaseResponseWriter.java
Author: hossman
Date: Thu Jun 3 00:03:26 2010
New Revision: 950831
URL: http://svn.apache.org/viewvc?rev=950831&view=rev
Log:
merging 950830 from trunk
Modified:
lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/response/ (props changed)
lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/response/BaseResponseWriter.java
Propchange: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/response/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Jun 3 00:03:26 2010
@@ -0,0 +1,6 @@
+/lucene/dev/trunk/solr/src/java/org/apache/solr/response:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270,941363,942166,942235,942288,942676,942719,943142,943493,943931,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950125,950207,950458,950613,950723,950830
+/lucene/java/branches/lucene_2_4/solr/src/java/org/apache/solr/response:748824
+/lucene/java/branches/lucene_2_9/solr/src/java/org/apache/solr/response:817269-818600,825998,829134,829881,831036,896850,909334
+/lucene/java/branches/lucene_2_9_back_compat_tests/solr/src/java/org/apache/solr/response:818601-821336
+/lucene/java/branches/lucene_3_0/solr/src/java/org/apache/solr/response:880793,896906
+/lucene/solr/trunk/src/java/org/apache/solr/response:922950-923910,923912-925091
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/response/BaseResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/response/BaseResponseWriter.java?rev=950831&r1=950830&r2=950831&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/response/BaseResponseWriter.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/response/BaseResponseWriter.java Thu Jun 3 00:03:26 2010
@@ -124,6 +124,7 @@ public abstract class BaseResponseWriter
if (idxInfo.includeScore && docList.hasScores()) {
sdoc.addField(SCORE_FIELD, iterator.score());
}
+ list.add(sdoc);
}
responseWriter.writeAllDocs(info, list);
}