You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2012/07/20 19:14:39 UTC
svn commit: r1363876 - in
/lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene:
index/AssertingAtomicReader.java util/LuceneTestCase.java
Author: rmuir
Date: Fri Jul 20 17:14:39 2012
New Revision: 1363876
URL: http://svn.apache.org/viewvc?rev=1363876&view=rev
Log:
turn assertingDirectoryReader back on
Modified:
lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/index/AssertingAtomicReader.java
lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java
Modified: lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/index/AssertingAtomicReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/index/AssertingAtomicReader.java?rev=1363876&r1=1363875&r2=1363876&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/index/AssertingAtomicReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/index/AssertingAtomicReader.java Fri Jul 20 17:14:39 2012
@@ -376,4 +376,17 @@ public class AssertingAtomicReader exten
return super.hasPayload();
}
}
+
+ // this is the same hack as FCInvisible
+ @Override
+ public Object getCoreCacheKey() {
+ return cacheKey;
+ }
+
+ @Override
+ public Object getCombinedCoreAndDeletesKey() {
+ return cacheKey;
+ }
+
+ private final Object cacheKey = new Object();
}
\ No newline at end of file
Modified: lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java?rev=1363876&r1=1363875&r2=1363876&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java (original)
+++ lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java Fri Jul 20 17:14:39 2012
@@ -1051,9 +1051,9 @@ public abstract class LuceneTestCase ext
// QueryUtils' reader with a fake cache key, so insanity checker cannot walk
// along our reader:
if (r instanceof AtomicReader) {
- r = new FCInvisibleMultiReader(new AssertingAtomicReader((AtomicReader)r));
+ r = new AssertingAtomicReader((AtomicReader)r);
} else if (r instanceof DirectoryReader) {
- r = new FCInvisibleMultiReader((DirectoryReader)r);
+ r = new AssertingDirectoryReader((DirectoryReader)r);
}
break;
default: