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 2011/01/28 01:45:31 UTC
svn commit: r1064390 - in /lucene/dev/branches/branch_3x/solr: ./ CHANGES.txt
src/solrj/org/apache/solr/client/solrj/response/QueryResponse.java
Author: hossman
Date: Fri Jan 28 00:45:31 2011
New Revision: 1064390
URL: http://svn.apache.org/viewvc?rev=1064390&view=rev
Log:
SOLR-2085: merge 1064386 from trunk
Modified:
lucene/dev/branches/branch_3x/solr/ (props changed)
lucene/dev/branches/branch_3x/solr/CHANGES.txt
lucene/dev/branches/branch_3x/solr/src/solrj/org/apache/solr/client/solrj/response/QueryResponse.java
Modified: lucene/dev/branches/branch_3x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/CHANGES.txt?rev=1064390&r1=1064389&r2=1064390&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_3x/solr/CHANGES.txt Fri Jan 28 00:45:31 2011
@@ -490,6 +490,9 @@ Bug Fixes
* SOLR-1283: HTMLStripCharFilter sometimes threw a "Mark Invalid" exception.
(Julien Coloos, hossman, yonik)
+* SOLR-2085: Improve SolrJ behavior when FacetComponent comes before
+ QueryComponent (Tomas Salfischberger via hossman)
+
Other Changes
----------------------
Modified: lucene/dev/branches/branch_3x/solr/src/solrj/org/apache/solr/client/solrj/response/QueryResponse.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/solrj/org/apache/solr/client/solrj/response/QueryResponse.java?rev=1064390&r1=1064389&r2=1064390&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/solrj/org/apache/solr/client/solrj/response/QueryResponse.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/solrj/org/apache/solr/client/solrj/response/QueryResponse.java Fri Jan 28 00:45:31 2011
@@ -104,7 +104,8 @@ public class QueryResponse extends SolrR
}
else if( "facet_counts".equals( n ) ) {
_facetInfo = (NamedList<Object>) res.getVal( i );
- extractFacetInfo( _facetInfo );
+ // extractFacetInfo inspects _results, so defer calling it
+ // in case it hasn't been populated yet.
}
else if( "debug".equals( n ) ) {
_debugInfo = (NamedList<Object>) res.getVal( i );
@@ -127,6 +128,7 @@ public class QueryResponse extends SolrR
extractTermsInfo( _termsInfo );
}
}
+ if(_facetInfo != null) extractFacetInfo( _facetInfo );
}
private void extractSpellCheckInfo(NamedList<Object> spellInfo) {