svn commit: r1374836 - in /lucene/dev/branches/branch_4x: ./ lucene/ lucene/core/ lucene/core/src/java/org/apache/lucene/util/WeakIdentityMap.java lucene/core/src/test/org/apache/lucene/util/TestFilterIterator.java

[us...@apache.org]

Author: uschindler
Date: Sun Aug 19 20:07:55 2012
New Revision: 1374836

URL: http://svn.apache.org/viewvc?rev=1374836&view=rev
Log:
Merged revision(s) 1374835 from lucene/dev/trunk:
Add a test for new FilterIterator

Added:
    lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/util/TestFilterIterator.java
      - copied unchanged from r1374835, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/TestFilterIterator.java
Modified:
    lucene/dev/branches/branch_4x/   (props changed)
    lucene/dev/branches/branch_4x/lucene/   (props changed)
    lucene/dev/branches/branch_4x/lucene/core/   (props changed)
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/WeakIdentityMap.java

Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/WeakIdentityMap.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/WeakIdentityMap.java?rev=1374836&r1=1374835&r2=1374836&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/WeakIdentityMap.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/WeakIdentityMap.java Sun Aug 19 20:07:55 2012
@@ -107,6 +107,8 @@ public final class WeakIdentityMap<K,V> 
   public Iterator<K> keyIterator() {
     reap();
     final Iterator<IdentityWeakReference> iterator = backingStore.keySet().iterator();
+    // IMPORTANT: Don't use oal.util.FilterIterator here:
+    // We need *strong* reference to current key after setNext()!!!
     return new Iterator<K>() {
       // holds strong reference to next element in backing iterator:
       private Object next = null;