Return-Path: Delivered-To: apmail-lucene-commits-archive@www.apache.org Received: (qmail 72827 invoked from network); 28 Jan 2011 00:35:03 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 28 Jan 2011 00:35:03 -0000 Received: (qmail 97280 invoked by uid 500); 28 Jan 2011 00:35:03 -0000 Mailing-List: contact commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@lucene.apache.org Delivered-To: mailing list commits@lucene.apache.org Received: (qmail 97273 invoked by uid 99); 28 Jan 2011 00:35:03 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 28 Jan 2011 00:35:03 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 28 Jan 2011 00:35:01 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A362323888CF; Fri, 28 Jan 2011 00:34:40 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1064386 - in /lucene/dev/trunk/solr: CHANGES.txt src/solrj/org/apache/solr/client/solrj/response/QueryResponse.java Date: Fri, 28 Jan 2011 00:34:40 -0000 To: commits@lucene.apache.org From: hossman@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110128003440.A362323888CF@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: hossman Date: Fri Jan 28 00:34:40 2011 New Revision: 1064386 URL: http://svn.apache.org/viewvc?rev=1064386&view=rev Log: SOLR-2085: Improve SolrJ behavior when FacetComponent comes before QueryComponent Modified: lucene/dev/trunk/solr/CHANGES.txt lucene/dev/trunk/solr/src/solrj/org/apache/solr/client/solrj/response/QueryResponse.java Modified: lucene/dev/trunk/solr/CHANGES.txt URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1064386&r1=1064385&r2=1064386&view=diff ============================================================================== --- lucene/dev/trunk/solr/CHANGES.txt (original) +++ lucene/dev/trunk/solr/CHANGES.txt Fri Jan 28 00:34:40 2011 @@ -166,6 +166,10 @@ Bug Fixes * SOLR-2320: Fixed ReplicationHandler detail reporting for masters (hossman) +* SOLR-2085: Improve SolrJ behavior when FacetComponent comes before + QueryComponent (Tomas Salfischberger via hossman) + + Other Changes ---------------------- Modified: lucene/dev/trunk/solr/src/solrj/org/apache/solr/client/solrj/response/QueryResponse.java URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/solrj/org/apache/solr/client/solrj/response/QueryResponse.java?rev=1064386&r1=1064385&r2=1064386&view=diff ============================================================================== --- lucene/dev/trunk/solr/src/solrj/org/apache/solr/client/solrj/response/QueryResponse.java (original) +++ lucene/dev/trunk/solr/src/solrj/org/apache/solr/client/solrj/response/QueryResponse.java Fri Jan 28 00:34:40 2011 @@ -105,7 +105,8 @@ public class QueryResponse extends SolrR } else if( "facet_counts".equals( n ) ) { _facetInfo = (NamedList) 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) res.getVal( i ); @@ -128,6 +129,7 @@ public class QueryResponse extends SolrR extractTermsInfo( _termsInfo ); } } + if(_facetInfo != null) extractFacetInfo( _facetInfo ); } private void extractSpellCheckInfo(NamedList> spellInfo) {