Accountables* methods are always a snapshot in time, so we don't need to make a copy here.
On Wed, Nov 26, 2014 at 9:26 AM, <jpou...@apache.org> wrote: > Author: jpountz > Date: Wed Nov 26 14:26:43 2014 > New Revision: 1641822 > > URL: http://svn.apache.org/r1641822 > Log: > LUCENE-6076: Fix locking in CachingWrapperFilter.getChildResources. > > Modified: > > lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/CachingWrapperFilter.java > > Modified: > lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/CachingWrapperFilter.java > URL: > http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/CachingWrapperFilter.java?rev=1641822&r1=1641821&r2=1641822&view=diff > ============================================================================== > --- > lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/CachingWrapperFilter.java > (original) > +++ > lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/CachingWrapperFilter.java > Wed Nov 26 14:26:43 2014 > @@ -22,6 +22,7 @@ import static org.apache.lucene.search.D > import java.io.IOException; > import java.util.ArrayList; > import java.util.Collections; > +import java.util.HashMap; > import java.util.List; > import java.util.Map; > import java.util.WeakHashMap; > @@ -146,8 +147,12 @@ public class CachingWrapperFilter extend > } > > @Override > - public synchronized Iterable<? extends Accountable> getChildResources() { > - // Sync only to pull the current set of values: > - return Accountables.namedAccountables("segment", cache); > + public Iterable<? extends Accountable> getChildResources() { > + // Sync to pull the current set of values: > + final Map<Object, DocIdSet> copy; > + synchronized (cache) { > + copy = new HashMap<>(cache); > + } > + return Accountables.namedAccountables("segment", copy); > } > } > > --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@lucene.apache.org For additional commands, e-mail: dev-h...@lucene.apache.org
