You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2014/06/14 16:46:11 UTC

svn commit: r1602590 - in /lucene/dev/trunk/solr: CHANGES.txt core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java

Author: shalin
Date: Sat Jun 14 14:46:10 2014
New Revision: 1602590

URL: http://svn.apache.org/r1602590
Log:
SOLR-6161: SolrDispatchFilter should throw java.lang.Error back even if wrapped in another exception

Modified:
    lucene/dev/trunk/solr/CHANGES.txt
    lucene/dev/trunk/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java

Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1602590&r1=1602589&r2=1602590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Sat Jun 14 14:46:10 2014
@@ -224,6 +224,9 @@ Other Changes
 * SOLR-5940: post.jar reports back detailed error in case of error responses.
   (Sameer Maggon, shalin, Uwe Schindler)
 
+* SOLR-6161: SolrDispatchFilter should throw java.lang.Error back even if wrapped in
+  another exception. (Miklos Christine via shalin)
+
 Optimizations
 ----------------------
 

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java?rev=1602590&r1=1602589&r2=1602590&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java Sat Jun 14 14:46:10 2014
@@ -437,6 +437,10 @@ public class SolrDispatchFilter extends 
         if (ex instanceof Error) {
           throw (Error) ex;
         }
+        if (ex.getCause() != null && ex.getCause() instanceof Error)  {
+          log.error("An Error was wrapped in another exception - please report complete stacktrace on SOLR-6161", ex);
+          throw (Error) ex.getCause();
+        }
         return;
       } finally {
         try {