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 sh...@apache.org on 2009/02/05 09:41:14 UTC
svn commit: r741046 - in /lucene/solr/trunk: CHANGES.txt
src/java/org/apache/solr/handler/component/QueryComponent.java
Author: shalin
Date: Thu Feb 5 08:41:14 2009
New Revision: 741046
URL: http://svn.apache.org/viewvc?rev=741046&view=rev
Log:
SOLR-435 -- NullPointerException with no query or empty query
Modified:
lucene/solr/trunk/CHANGES.txt
lucene/solr/trunk/src/java/org/apache/solr/handler/component/QueryComponent.java
Modified: lucene/solr/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/CHANGES.txt?rev=741046&r1=741045&r2=741046&view=diff
==============================================================================
--- lucene/solr/trunk/CHANGES.txt (original)
+++ lucene/solr/trunk/CHANGES.txt Thu Feb 5 08:41:14 2009
@@ -236,6 +236,8 @@
27. SOLR-991: Better error message when parsing solrconfig.xml fails due to malformed XML. Error message notes the name
of the file being parsed. (Michael Henson via shalin)
+28. SOLR-435: NullPointerException with no query or empty query (ryan, Lars Kotthoff via shalin)
+
Other Changes
----------------------
Modified: lucene/solr/trunk/src/java/org/apache/solr/handler/component/QueryComponent.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/handler/component/QueryComponent.java?rev=741046&r1=741045&r2=741046&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/handler/component/QueryComponent.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/handler/component/QueryComponent.java Thu Feb 5 08:41:14 2009
@@ -74,7 +74,12 @@
defType = defType==null ? OldLuceneQParserPlugin.NAME : defType;
if (rb.getQueryString() == null) {
- rb.setQueryString( params.get( CommonParams.Q ) );
+ rb.setQueryString(params.get(CommonParams.Q));
+ String queryString = params.get(CommonParams.Q);
+ if (queryString == null) {
+ throw new SolrException(SolrException.ErrorCode.BAD_REQUEST,
+ "Missing or empty required parameter: q");
+ }
}
try {