svn commit: r1234389 - /lucene/dev/branches/solrcloud/solr/solrj/src/java/org/apache/solr/common/SolrException.java

[ma...@apache.org]

Author: markrmiller
Date: Sat Jan 21 18:34:42 2012
New Revision: 1234389

URL: http://svn.apache.org/viewvc?rev=1234389&view=rev
Log:
always log assertion errors

Modified:
    lucene/dev/branches/solrcloud/solr/solrj/src/java/org/apache/solr/common/SolrException.java

Modified: lucene/dev/branches/solrcloud/solr/solrj/src/java/org/apache/solr/common/SolrException.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/solrj/src/java/org/apache/solr/common/SolrException.java?rev=1234389&r1=1234388&r2=1234389&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/solrj/src/java/org/apache/solr/common/SolrException.java (original)
+++ lucene/dev/branches/solrcloud/solr/solrj/src/java/org/apache/solr/common/SolrException.java Sat Jan 21 18:34:42 2012
@@ -74,7 +74,7 @@ public class SolrException extends Runti
   public void log(Logger log) { log(log,this); }
   public static void log(Logger log, Throwable e) {
     String stackTrace = toStr(e);
-    String ignore = doIgnore(stackTrace);
+    String ignore = doIgnore(e, stackTrace);
     if (ignore != null) {
       log.info(ignore);
       return;
@@ -85,7 +85,7 @@ public class SolrException extends Runti
 
   public static void log(Logger log, String msg, Throwable e) {
     String stackTrace = msg + ':' + toStr(e);
-    String ignore = doIgnore(stackTrace);
+    String ignore = doIgnore(e, stackTrace);
     if (ignore != null) {
       log.info(ignore);
       return;
@@ -95,7 +95,7 @@ public class SolrException extends Runti
   
   public static void log(Logger log, String msg) {
     String stackTrace = msg;
-    String ignore = doIgnore(stackTrace);
+    String ignore = doIgnore(null, stackTrace);
     if (ignore != null) {
       log.info(ignore);
       return;
@@ -129,8 +129,9 @@ public class SolrException extends Runti
   public static Set<String> ignorePatterns;
 
   /** Returns null if this exception does not match any ignore patterns, or a message string to use if it does. */
-  public static String doIgnore(String m) {
+  public static String doIgnore(Throwable t, String m) {
     if (ignorePatterns == null || m == null) return null;
+    if (t != null && t instanceof AssertionError) return null;
 
     for (String regex : ignorePatterns) {
       Pattern pattern = Pattern.compile(regex);