From b93f0902ce94a8a7dff1892e50a214972384c1b3 Mon Sep 17 00:00:00 2001
From: Uwe Schindler <uschindler@apache.org>
Date: Wed, 14 Dec 2011 17:16:53 +0000
Subject: [PATCH] LUCENE-3531: Revert adding Reader/CoreClosedListeners in
 CachingWrapperFilter

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1214349 13f79535-47bb-0310-9956-ffa450edef68
---
 .../lucene/search/CachingWrapperFilter.java   | 20 +------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/lucene/src/java/org/apache/lucene/search/CachingWrapperFilter.java b/lucene/src/java/org/apache/lucene/search/CachingWrapperFilter.java
index 1679965d70c..dcc1ac082b4 100644
--- a/lucene/src/java/org/apache/lucene/search/CachingWrapperFilter.java
+++ b/lucene/src/java/org/apache/lucene/search/CachingWrapperFilter.java
@@ -23,7 +23,6 @@ import java.util.WeakHashMap;
 
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.IndexReader.AtomicReaderContext;
-import org.apache.lucene.index.SegmentReader;
 import org.apache.lucene.util.FixedBitSet;
 import org.apache.lucene.util.Bits;
 import org.apache.lucene.util.WeakIdentityHashMap;
@@ -41,7 +40,7 @@ public class CachingWrapperFilter extends Filter {
   private final FilterCache cache = new FilterCache();
   private final boolean recacheDeletes;
 
-  private static class FilterCache implements SegmentReader.CoreClosedListener, IndexReader.ReaderClosedListener {
+  private static class FilterCache {
     private final WeakHashMap<Object,WeakIdentityHashMap<Bits,SoftReference<DocIdSet>>> cache =
       new WeakHashMap<Object,WeakIdentityHashMap<Bits,SoftReference<DocIdSet>>>();
 
@@ -49,13 +48,6 @@ public class CachingWrapperFilter extends Filter {
       final Object coreKey = reader.getCoreCacheKey();
       WeakIdentityHashMap<Bits,SoftReference<DocIdSet>> innerCache = cache.get(coreKey);
       if (innerCache == null) {
-        if (reader instanceof SegmentReader) {
-          ((SegmentReader) reader).addCoreClosedListener(this);
-        } else {
-          assert reader.getSequentialSubReaders() == null : 
-            "we only operate on AtomicContext, so all cached readers must be atomic";
-          reader.addReaderClosedListener(this);
-        }
         innerCache = new WeakIdentityHashMap<Bits,SoftReference<DocIdSet>>();
         cache.put(coreKey, innerCache);
       }
@@ -67,16 +59,6 @@ public class CachingWrapperFilter extends Filter {
     public synchronized void put(IndexReader reader, Bits acceptDocs, DocIdSet value) {
       cache.get(reader.getCoreCacheKey()).put(acceptDocs, new SoftReference<DocIdSet>(value));
     }
-    
-    @Override
-    public synchronized void onClose(IndexReader reader) {
-      cache.remove(reader.getCoreCacheKey());
-    }
-    
-    @Override
-    public synchronized void onClose(SegmentReader reader) {
-      cache.remove(reader.getCoreCacheKey());
-    }
   }
 
   /** Wraps another filter's result and caches it.