lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rm...@apache.org
Subject svn commit: r1162167 - in /lucene/dev/branches/branch_3x: ./ lucene/ lucene/backwards/ lucene/backwards/src/test-framework/ lucene/backwards/src/test/ lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java solr/
Date Fri, 26 Aug 2011 17:00:33 GMT
Author: rmuir
Date: Fri Aug 26 17:00:32 2011
New Revision: 1162167

URL: http://svn.apache.org/viewvc?rev=1162167&view=rev
Log:
clean up maxclausecount restore

Modified:
    lucene/dev/branches/branch_3x/   (props changed)
    lucene/dev/branches/branch_3x/lucene/   (props changed)
    lucene/dev/branches/branch_3x/lucene/backwards/   (props changed)
    lucene/dev/branches/branch_3x/lucene/backwards/src/test/   (props changed)
    lucene/dev/branches/branch_3x/lucene/backwards/src/test-framework/   (props changed)
    lucene/dev/branches/branch_3x/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java
    lucene/dev/branches/branch_3x/solr/   (props changed)

Modified: lucene/dev/branches/branch_3x/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java?rev=1162167&r1=1162166&r2=1162167&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java
(original)
+++ lucene/dev/branches/branch_3x/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java
Fri Aug 26 17:00:32 2011
@@ -156,7 +156,7 @@ public abstract class LuceneTestCase ext
    */
   public static final int RANDOM_MULTIPLIER = Integer.parseInt(System.getProperty("tests.multiplier",
"1"));
   
-  private int savedBoolMaxClauseCount;
+  private int savedBoolMaxClauseCount = BooleanQuery.getMaxClauseCount();
 
   private volatile Thread.UncaughtExceptionHandler savedUncaughtExceptionHandler = null;
   
@@ -500,10 +500,7 @@ public abstract class LuceneTestCase ext
       if (problem == null) problem = t;
     }
 
-    // if you didn't call super.setUp, you can get a confusing IAE here.
-    if (problem != null) {
-      BooleanQuery.setMaxClauseCount(savedBoolMaxClauseCount);
-    }
+    BooleanQuery.setMaxClauseCount(savedBoolMaxClauseCount);
 
     // this won't throw any exceptions or fail the test
     // if we change this, then change this logic



Mime
View raw message