You are viewing a plain text version of this content. The canonical link for it is here.
Posted to solr-commits@lucene.apache.org by yo...@apache.org on 2008/07/07 18:37:32 UTC
svn commit: r674549 - in /lucene/solr/trunk/src:
java/org/apache/solr/handler/component/DebugComponent.java
test/org/apache/solr/TestDistributedSearch.java
Author: yonik
Date: Mon Jul 7 09:37:30 2008
New Revision: 674549
URL: http://svn.apache.org/viewvc?rev=674549&view=rev
Log:
fix distributed search null pointer exception when no docs are matched and debugQuery=true
Modified:
lucene/solr/trunk/src/java/org/apache/solr/handler/component/DebugComponent.java
lucene/solr/trunk/src/test/org/apache/solr/TestDistributedSearch.java
Modified: lucene/solr/trunk/src/java/org/apache/solr/handler/component/DebugComponent.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/handler/component/DebugComponent.java?rev=674549&r1=674548&r2=674549&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/handler/component/DebugComponent.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/handler/component/DebugComponent.java Mon Jul 7 09:37:30 2008
@@ -87,7 +87,7 @@
public void modifyRequest(ResponseBuilder rb, SearchComponent who, ShardRequest sreq) {
if (!rb.isDebug()) return;
- // Turn on debug to get explain only only when retrieving fields
+ // Turn on debug to get explain only when retrieving fields
if ((sreq.purpose & ShardRequest.PURPOSE_GET_FIELDS) != 0) {
sreq.purpose |= ShardRequest.PURPOSE_GET_DEBUG;
sreq.params.set("debugQuery", "true");
@@ -130,6 +130,10 @@
}
explain = HighlightComponent.removeNulls(new SimpleOrderedMap(Arrays.asList(arr)));
+
+ if (info == null) {
+ info = new NamedList();
+ }
int idx = info.indexOf("explain",0);
if (idx>=0) {
info.setVal(idx, explain);
Modified: lucene/solr/trunk/src/test/org/apache/solr/TestDistributedSearch.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/test/org/apache/solr/TestDistributedSearch.java?rev=674549&r1=674548&r2=674549&view=diff
==============================================================================
--- lucene/solr/trunk/src/test/org/apache/solr/TestDistributedSearch.java (original)
+++ lucene/solr/trunk/src/test/org/apache/solr/TestDistributedSearch.java Mon Jul 7 09:37:30 2008
@@ -486,6 +486,9 @@
query("q","now their fox sat had put","fl","*,score",
"debugQuery", "true");
+ query("q","matchesnothing","fl","*,score",
+ "debugQuery", "true");
+
query("q","*:*", "rows",100, "facet","true", "facet.field",t1);
query("q","*:*", "rows",100, "facet","true", "facet.field",t1,"facet.limit",1);
query("q","*:*", "rows",100, "facet","true", "facet.query","quick", "facet.query","all", "facet.query","*:*");