From 95e42190cf087ccd83b8843669f96a3afeeb4b7f Mon Sep 17 00:00:00 2001 From: Mark Robert Miller Date: Thu, 14 May 2009 13:41:52 +0000 Subject: [PATCH] SOLR-1160: possible null pointer exception path git-svn-id: https://svn.apache.org/repos/asf/lucene/solr/trunk@774765 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/solr/handler/RequestHandlerBase.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/java/org/apache/solr/handler/RequestHandlerBase.java b/src/java/org/apache/solr/handler/RequestHandlerBase.java index dfe7bb817ee..0c7d5b90e14 100644 --- a/src/java/org/apache/solr/handler/RequestHandlerBase.java +++ b/src/java/org/apache/solr/handler/RequestHandlerBase.java @@ -130,10 +130,14 @@ public abstract class RequestHandlerBase implements SolrRequestHandler, SolrInfo 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);