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 ma...@apache.org on 2009/05/14 15:41:52 UTC
svn commit: r774765 -
/lucene/solr/trunk/src/java/org/apache/solr/handler/RequestHandlerBase.java
Author: markrmiller
Date: Thu May 14 13:41:52 2009
New Revision: 774765
URL: http://svn.apache.org/viewvc?rev=774765&view=rev
Log:
SOLR-1160: possible null pointer exception path
Modified:
lucene/solr/trunk/src/java/org/apache/solr/handler/RequestHandlerBase.java
Modified: lucene/solr/trunk/src/java/org/apache/solr/handler/RequestHandlerBase.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/handler/RequestHandlerBase.java?rev=774765&r1=774764&r2=774765&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/handler/RequestHandlerBase.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/handler/RequestHandlerBase.java Thu May 14 13:41:52 2009
@@ -130,10 +130,14 @@
rsp.setHttpCaching(httpCaching);
handleRequestBody( req, rsp );
// count timeouts
- boolean timedOut = (Boolean)rsp.getResponseHeader().get("partialResults") == null ? false : (Boolean)rsp.getResponseHeader().get("partialResults");
- if( timedOut ) {
- numTimeouts++;
- rsp.setHttpCaching(false);
+ NamedList header = rsp.getResponseHeader();
+ if(header != null) {
+ Object partialResults = header.get("partialResults");
+ boolean timedOut = partialResults == null ? false : (Boolean)partialResults;
+ if( timedOut ) {
+ numTimeouts++;
+ rsp.setHttpCaching(false);
+ }
}
} catch (Exception e) {
SolrException.log(SolrCore.log,e);