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 ko...@apache.org on 2009/02/11 06:14:13 UTC

svn commit: r743228 - in /lucene/solr/trunk: CHANGES.txt src/java/org/apache/solr/core/SolrCore.java

Author: koji
Date: Wed Feb 11 05:14:11 2009
New Revision: 743228

URL: http://svn.apache.org/viewvc?rev=743228&view=rev
Log:
SOLR-1016: HTTP 503 error changes 500 in SolrCore

Modified:
    lucene/solr/trunk/CHANGES.txt
    lucene/solr/trunk/src/java/org/apache/solr/core/SolrCore.java

Modified: lucene/solr/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/CHANGES.txt?rev=743228&r1=743227&r2=743228&view=diff
==============================================================================
--- lucene/solr/trunk/CHANGES.txt (original)
+++ lucene/solr/trunk/CHANGES.txt Wed Feb 11 05:14:11 2009
@@ -256,6 +256,8 @@
         <query>office:Bridgewater</query><query>office:Osaka</query>
       </delete>
 
+30. SOLR-1016: HTTP 503 error changes 500 in SolrCore (koji)
+
 
 Other Changes
 ----------------------

Modified: lucene/solr/trunk/src/java/org/apache/solr/core/SolrCore.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/core/SolrCore.java?rev=743228&r1=743227&r2=743228&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/core/SolrCore.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/core/SolrCore.java Wed Feb 11 05:14:11 2009
@@ -1361,9 +1361,17 @@
     // TODO should check that responseHeader has not been replaced by handler
 	NamedList responseHeader = rsp.getResponseHeader();
     final int qtime=(int)(rsp.getEndTime() - req.getStartTime());
-    responseHeader.add("status",rsp.getException()==null ? 0 : 500);
+    int status = 0;
+    Exception exception = rsp.getException();
+    if( exception != null ){
+      if( exception instanceof SolrException )
+        status = ((SolrException)exception).code();
+      else
+        status = 500;
+    }
+    responseHeader.add("status",status);
     responseHeader.add("QTime",qtime);
-    rsp.getToLog().add("status",rsp.getException()==null ? 0 : 500);
+    rsp.getToLog().add("status",status);
     rsp.getToLog().add("QTime",qtime);
     
     SolrParams params = req.getParams();