directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1136431 - in /directory: apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/ apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/filtering/ apacheds/trunk/core-api/src/main/java/org/apache/directory/s...
Date Thu, 16 Jun 2011 13:31:27 GMT
Author: elecharny
Date: Thu Jun 16 13:31:25 2011
New Revision: 1136431

URL: http://svn.apache.org/viewvc?rev=1136431&view=rev
Log:
o Removed the isElementReused() method from the cursor Interface : it's not used anywhere.

Modified:
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/EntryToResponseCursor.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/filtering/BaseEntryFilteringCursor.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/filtering/CursorList.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/NullPartition.java
    directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockCursor.java
    directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/ArrayTreeCursor.java
    directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlSingletonOrOrderedSetCursor.java
    directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeCursor.java
    directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeMapNoDupsWrapperCursor.java
    directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/KeyTupleAvlCursor.java
    directory/apacheds/trunk/core-avl/src/test/java/org/apache/directory/server/core/avltree/ArrayTreeCursorTest.java
    directory/apacheds/trunk/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreeCursorTest.java
    directory/apacheds/trunk/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreeMapNoDupsCursorTest.java
    directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursor.java
    directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursor.java
    directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyBTreeCursor.java
    directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleArrayCursor.java
    directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursor.java
    directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursor.java
    directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursorTest.java
    directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursorTest.java
    directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyBTreeCursorTest.java
    directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyCursorTest.java
    directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleArrayCursorTest.java
    directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursorTest.java
    directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursorTest.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaEventLogCursor.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexCursorAdaptor.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/ServerEntryCursorAdaptor.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/ValueArrayCursor.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/EmptyIndexCursor.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/SingletonIndexCursor.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlTableDupsCursor.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/AllEntriesCursor.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/AndCursor.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateCursor.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityCursor.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqCursor.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqCursor.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/NotCursor.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeCursor.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/OrCursor.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/PresenceCursor.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringCursor.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeCursor.java
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/EmptyIndexCursorTest.java
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/SingletonIndexCursorTest.java
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java
    directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/EntryCursorImpl.java
    directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/SearchCursorImpl.java
    directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/cursor/Cursor.java
    directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/cursor/EmptyCursor.java
    directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/cursor/ListCursor.java
    directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/cursor/SingletonCursor.java

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/EntryToResponseCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/EntryToResponseCursor.java?rev=1136431&r1=1136430&r2=1136431&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/EntryToResponseCursor.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/EntryToResponseCursor.java Thu Jun 16 13:31:25 2011
@@ -147,12 +147,6 @@ public class EntryToResponseCursor imple
     }
 
 
-    public boolean isElementReused()
-    {
-        return wrapped.isElementReused();
-    }
-
-
     public boolean last() throws Exception
     {
         return wrapped.last();

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/filtering/BaseEntryFilteringCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/filtering/BaseEntryFilteringCursor.java?rev=1136431&r1=1136430&r2=1136431&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/filtering/BaseEntryFilteringCursor.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/filtering/BaseEntryFilteringCursor.java Thu Jun 16 13:31:25 2011
@@ -338,18 +338,6 @@ public class BaseEntryFilteringCursor im
 
 
     /* 
-     * @see Cursor#isElementReused()
-     */
-    /* (non-Javadoc)
-     * @see org.apache.directory.server.core.filtering.EntryFilteringCursor#isElementReused()
-     */
-    public boolean isElementReused()
-    {
-        return true;
-    }
-
-
-    /* 
      * @see Cursor#last()
      */
     /* (non-Javadoc)

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/filtering/CursorList.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/filtering/CursorList.java?rev=1136431&r1=1136430&r2=1136431&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/filtering/CursorList.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/filtering/CursorList.java Thu Jun 16 13:31:25 2011
@@ -379,15 +379,6 @@ public class CursorList implements Entry
     }
 
 
-    /**
-     * {@inheritDoc}
-     */
-    public boolean isElementReused()
-    {
-        return true;
-    }
-
-
     public boolean addEntryFilter( EntryFilter filter )
     {
         for ( EntryFilteringCursor efc : list )

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/NullPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/NullPartition.java?rev=1136431&r1=1136430&r2=1136431&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/NullPartition.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/NullPartition.java Thu Jun 16 13:31:25 2011
@@ -140,12 +140,6 @@ public class NullPartition extends Abstr
             }
             
         
-            public boolean isElementReused()
-            {
-                return false;
-            }
-            
-        
             public boolean isClosed() throws Exception
             {
                 return true;

Modified: directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockCursor.java?rev=1136431&r1=1136430&r2=1136431&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockCursor.java (original)
+++ directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockCursor.java Thu Jun 16 13:31:25 2011
@@ -116,12 +116,6 @@ public class MockCursor implements Curso
     }
 
 
-    public boolean isElementReused()
-    {
-        return false;
-    }
-
-
     public boolean last() throws Exception
     {
         ii = count;

Modified: directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/ArrayTreeCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/ArrayTreeCursor.java?rev=1136431&r1=1136430&r2=1136431&view=diff
==============================================================================
--- directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/ArrayTreeCursor.java (original)
+++ directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/ArrayTreeCursor.java Thu Jun 16 13:31:25 2011
@@ -186,15 +186,6 @@ public class ArrayTreeCursor<K> extends 
     /**
      * {@inheritDoc}
      */
-    public boolean isElementReused()
-    {
-        return true;
-    }
-
-
-    /**
-     * {@inheritDoc}
-     */
     public boolean last() throws Exception
     {
         checkNotClosed( "last" );

Modified: directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlSingletonOrOrderedSetCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlSingletonOrOrderedSetCursor.java?rev=1136431&r1=1136430&r2=1136431&view=diff
==============================================================================
--- directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlSingletonOrOrderedSetCursor.java (original)
+++ directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlSingletonOrOrderedSetCursor.java Thu Jun 16 13:31:25 2011
@@ -23,8 +23,8 @@ package org.apache.directory.server.core
 import java.util.Comparator;
 
 import org.apache.directory.shared.ldap.model.cursor.AbstractTupleCursor;
-import org.apache.directory.shared.ldap.model.cursor.Tuple;
 import org.apache.directory.shared.ldap.model.cursor.InvalidCursorPositionException;
+import org.apache.directory.shared.ldap.model.cursor.Tuple;
 
 
 /**
@@ -132,12 +132,6 @@ public class AvlSingletonOrOrderedSetCur
     }
 
 
-    public boolean isElementReused()
-    {
-        return true;
-    }
-
-
     public boolean last() throws Exception
     {
         checkNotClosed( "last" );

Modified: directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeCursor.java?rev=1136431&r1=1136430&r2=1136431&view=diff
==============================================================================
--- directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeCursor.java (original)
+++ directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeCursor.java Thu Jun 16 13:31:25 2011
@@ -153,12 +153,6 @@ public class AvlTreeCursor<K> extends Ab
     }
 
 
-    public boolean isElementReused()
-    {
-        return true;
-    }
-
-
     public boolean last() throws Exception
     {
         checkNotClosed( "last" );

Modified: directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeMapNoDupsWrapperCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeMapNoDupsWrapperCursor.java?rev=1136431&r1=1136430&r2=1136431&view=diff
==============================================================================
--- directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeMapNoDupsWrapperCursor.java (original)
+++ directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeMapNoDupsWrapperCursor.java Thu Jun 16 13:31:25 2011
@@ -20,8 +20,8 @@
 package org.apache.directory.server.core.avltree;
 
 import org.apache.directory.shared.ldap.model.cursor.AbstractTupleCursor;
-import org.apache.directory.shared.ldap.model.cursor.Tuple;
 import org.apache.directory.shared.ldap.model.cursor.InvalidCursorPositionException;
+import org.apache.directory.shared.ldap.model.cursor.Tuple;
 
 
 /**
@@ -123,12 +123,6 @@ public class AvlTreeMapNoDupsWrapperCurs
     }
 
     
-    public boolean isElementReused()
-    {
-        return true;
-    }
-
-    
     public boolean last() throws Exception
     {
         return wrapped.last();

Modified: directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/KeyTupleAvlCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/KeyTupleAvlCursor.java?rev=1136431&r1=1136430&r2=1136431&view=diff
==============================================================================
--- directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/KeyTupleAvlCursor.java (original)
+++ directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/KeyTupleAvlCursor.java Thu Jun 16 13:31:25 2011
@@ -204,10 +204,4 @@ public class KeyTupleAvlCursor<K,V> exte
 
         throw new InvalidCursorPositionException();
     }
-
-
-    public boolean isElementReused()
-    {
-        return true;
-    }
 }
\ No newline at end of file

Modified: directory/apacheds/trunk/core-avl/src/test/java/org/apache/directory/server/core/avltree/ArrayTreeCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-avl/src/test/java/org/apache/directory/server/core/avltree/ArrayTreeCursorTest.java?rev=1136431&r1=1136430&r2=1136431&view=diff
==============================================================================
--- directory/apacheds/trunk/core-avl/src/test/java/org/apache/directory/server/core/avltree/ArrayTreeCursorTest.java (original)
+++ directory/apacheds/trunk/core-avl/src/test/java/org/apache/directory/server/core/avltree/ArrayTreeCursorTest.java Thu Jun 16 13:31:25 2011
@@ -20,19 +20,20 @@
 package org.apache.directory.server.core.avltree;
 
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
 import java.util.Comparator;
 
-import com.mycila.junit.concurrent.Concurrency;
-import com.mycila.junit.concurrent.ConcurrentJunitRunner;
 import org.apache.directory.shared.ldap.model.cursor.InvalidCursorPositionException;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import com.mycila.junit.concurrent.Concurrency;
+import com.mycila.junit.concurrent.ConcurrentJunitRunner;
 
 
 /**
@@ -52,7 +53,6 @@ public class ArrayTreeCursorTest
         
         assertFalse( cursor.isClosed() );
         assertFalse( cursor.available() );
-        assertTrue( cursor.isElementReused() );
         
         try
         {
@@ -102,7 +102,6 @@ public class ArrayTreeCursorTest
         
         assertFalse( cursor.isClosed() );
         assertFalse( cursor.available() );
-        assertTrue( cursor.isElementReused() );
         
         try
         {
@@ -201,7 +200,6 @@ public class ArrayTreeCursorTest
         
         assertFalse( cursor.isClosed() );
         assertFalse( cursor.available() );
-        assertTrue( cursor.isElementReused() );
         assertEquals( 4, tree.size() );
         
         try

Modified: directory/apacheds/trunk/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreeCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreeCursorTest.java?rev=1136431&r1=1136430&r2=1136431&view=diff
==============================================================================
--- directory/apacheds/trunk/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreeCursorTest.java (original)
+++ directory/apacheds/trunk/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreeCursorTest.java Thu Jun 16 13:31:25 2011
@@ -20,19 +20,20 @@
 package org.apache.directory.server.core.avltree;
 
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
 import java.util.Comparator;
 
-import com.mycila.junit.concurrent.Concurrency;
-import com.mycila.junit.concurrent.ConcurrentJunitRunner;
 import org.apache.directory.shared.ldap.model.cursor.InvalidCursorPositionException;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import com.mycila.junit.concurrent.Concurrency;
+import com.mycila.junit.concurrent.ConcurrentJunitRunner;
 
 
 /**
@@ -52,7 +53,6 @@ public class AvlTreeCursorTest
         
         assertFalse( cursor.isClosed() );
         assertFalse( cursor.available() );
-        assertTrue( cursor.isElementReused() );
         
         try
         {
@@ -102,7 +102,6 @@ public class AvlTreeCursorTest
         
         assertFalse( cursor.isClosed() );
         assertFalse( cursor.available() );
-        assertTrue( cursor.isElementReused() );
         
         try
         {
@@ -201,7 +200,6 @@ public class AvlTreeCursorTest
         
         assertFalse( cursor.isClosed() );
         assertFalse( cursor.available() );
-        assertTrue( cursor.isElementReused() );
         assertEquals( 4, tree.getSize() );
         
         try

Modified: directory/apacheds/trunk/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreeMapNoDupsCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreeMapNoDupsCursorTest.java?rev=1136431&r1=1136430&r2=1136431&view=diff
==============================================================================
--- directory/apacheds/trunk/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreeMapNoDupsCursorTest.java (original)
+++ directory/apacheds/trunk/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreeMapNoDupsCursorTest.java Thu Jun 16 13:31:25 2011
@@ -28,8 +28,8 @@ import static org.junit.Assert.fail;
 
 import java.util.Comparator;
 
-import org.apache.directory.shared.ldap.model.cursor.Tuple;
 import org.apache.directory.shared.ldap.model.cursor.InvalidCursorPositionException;
+import org.apache.directory.shared.ldap.model.cursor.Tuple;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -71,7 +71,6 @@ public class AvlTreeMapNoDupsCursorTest
     {
         assertFalse( cursor.isClosed() );
         assertFalse( cursor.available() );
-        assertTrue( cursor.isElementReused() );
 
         try
         {
@@ -118,7 +117,6 @@ public class AvlTreeMapNoDupsCursorTest
         tree.insert( 7, 7 );
         assertFalse( cursor.isClosed() );
         assertFalse( cursor.available() );
-        assertTrue( cursor.isElementReused() );
 
         try
         {
@@ -221,7 +219,6 @@ public class AvlTreeMapNoDupsCursorTest
 
         assertFalse( cursor.isClosed() );
         assertFalse( cursor.available() );
-        assertTrue( cursor.isElementReused() );
         assertEquals( 4, tree.getSize() );
 
         try

Modified: directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursor.java?rev=1136431&r1=1136430&r2=1136431&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursor.java (original)
+++ directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursor.java Thu Jun 16 13:31:25 2011
@@ -20,15 +20,15 @@
 package org.apache.directory.server.core.partition.impl.btree.jdbm;
 
 
+import java.io.IOException;
+
+import jdbm.helper.TupleBrowser;
+
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.model.cursor.AbstractTupleCursor;
 import org.apache.directory.shared.ldap.model.cursor.InvalidCursorPositionException;
 import org.apache.directory.shared.ldap.model.cursor.Tuple;
 
-import jdbm.helper.TupleBrowser;
-
-import java.io.IOException;
-
 
 /**
  * A cursor for browsing tables with duplicates which returns the container
@@ -275,10 +275,4 @@ public class DupsContainerCursor<K,V> ex
 
         throw new InvalidCursorPositionException();
     }
-
-
-    public boolean isElementReused()
-    {
-        return true;
-    }
 }

Modified: directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursor.java?rev=1136431&r1=1136430&r2=1136431&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursor.java (original)
+++ directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursor.java Thu Jun 16 13:31:25 2011
@@ -456,10 +456,4 @@ class DupsCursor<K,V> extends AbstractTu
 
         return returnedTuple;
     }
-
-
-    public boolean isElementReused()
-    {
-        return true;
-    }
 }

Modified: directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyBTreeCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyBTreeCursor.java?rev=1136431&r1=1136430&r2=1136431&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyBTreeCursor.java (original)
+++ directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyBTreeCursor.java Thu Jun 16 13:31:25 2011
@@ -19,12 +19,12 @@
 package org.apache.directory.server.core.partition.impl.btree.jdbm;
 
 
+import java.util.Comparator;
+
 import jdbm.btree.BTree;
 import jdbm.helper.Tuple;
 import jdbm.helper.TupleBrowser;
 
-import java.util.Comparator;
-
 import org.apache.directory.shared.ldap.model.cursor.AbstractCursor;
 import org.apache.directory.shared.ldap.model.cursor.InvalidCursorPositionException;
 
@@ -202,10 +202,4 @@ public class KeyBTreeCursor<E> extends A
 
         throw new InvalidCursorPositionException();
     }
-
-
-    public boolean isElementReused()
-    {
-        return false;
-    }
 }

Modified: directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleArrayCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleArrayCursor.java?rev=1136431&r1=1136430&r2=1136431&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleArrayCursor.java (original)
+++ directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleArrayCursor.java Thu Jun 16 13:31:25 2011
@@ -206,10 +206,4 @@ public class KeyTupleArrayCursor<K,V> ex
 
         throw new InvalidCursorPositionException();
     }
-
-
-    public boolean isElementReused()
-    {
-        return true;
-    }
 }

Modified: directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursor.java?rev=1136431&r1=1136430&r2=1136431&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursor.java (original)
+++ directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursor.java Thu Jun 16 13:31:25 2011
@@ -19,16 +19,16 @@
 package org.apache.directory.server.core.partition.impl.btree.jdbm;
 
 
+import java.util.Comparator;
+
+import jdbm.btree.BTree;
+import jdbm.helper.TupleBrowser;
+
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.model.cursor.AbstractTupleCursor;
 import org.apache.directory.shared.ldap.model.cursor.InvalidCursorPositionException;
 import org.apache.directory.shared.ldap.model.cursor.Tuple;
 
-import java.util.Comparator;
-
-import jdbm.helper.TupleBrowser;
-import jdbm.btree.BTree;
-
 
 /**
  * Cursor over a set of values for the same key which are store in another
@@ -268,10 +268,4 @@ public class KeyTupleBTreeCursor<K,V> ex
 
         throw new InvalidCursorPositionException();
     }
-
-
-    public boolean isElementReused()
-    {
-        return true;
-    }
 }

Modified: directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursor.java?rev=1136431&r1=1136430&r2=1136431&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursor.java (original)
+++ directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursor.java Thu Jun 16 13:31:25 2011
@@ -19,15 +19,15 @@
 package org.apache.directory.server.core.partition.impl.btree.jdbm;
 
 
+import java.io.IOException;
+
+import jdbm.helper.TupleBrowser;
+
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.model.cursor.AbstractTupleCursor;
 import org.apache.directory.shared.ldap.model.cursor.InvalidCursorPositionException;
 import org.apache.directory.shared.ldap.model.cursor.Tuple;
 
-import java.io.IOException;
-
-import jdbm.helper.TupleBrowser;
-
 
 /**
  * Cursor over the Tuples of a JDBM BTree.  Duplicate keys are not supported
@@ -242,10 +242,4 @@ class NoDupsCursor<K,V> extends Abstract
 
         throw new InvalidCursorPositionException();
     }
-
-
-    public boolean isElementReused()
-    {
-        return true;
-    }
 }

Modified: directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursorTest.java?rev=1136431&r1=1136430&r2=1136431&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursorTest.java (original)
+++ directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursorTest.java Thu Jun 16 13:31:25 2011
@@ -160,7 +160,6 @@ public class DupsContainerCursorTest
 
         assertFalse( cursor.available() );
         assertFalse( cursor.isClosed() );
-        assertTrue( cursor.isElementReused() );
 
         cursor = new DupsContainerCursor<String,String>( table );
         assertFalse( cursor.previous() );

Modified: directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursorTest.java?rev=1136431&r1=1136430&r2=1136431&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursorTest.java (original)
+++ directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursorTest.java Thu Jun 16 13:31:25 2011
@@ -22,7 +22,6 @@ package org.apache.directory.server.core
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 import java.io.File;
@@ -1433,7 +1432,6 @@ public class DupsCursorTest
     {
         Cursor<Tuple<String,String>> cursor = table.cursor();
         assertNotNull( cursor );
-        assertTrue( cursor.isElementReused() );
 
         try
         {

Modified: directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyBTreeCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyBTreeCursorTest.java?rev=1136431&r1=1136430&r2=1136431&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyBTreeCursorTest.java (original)
+++ directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyBTreeCursorTest.java Thu Jun 16 13:31:25 2011
@@ -19,28 +19,28 @@
 package org.apache.directory.server.core.partition.impl.btree.jdbm;
 
 
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import java.io.File;
+import java.util.Comparator;
 
 import jdbm.RecordManager;
+import jdbm.btree.BTree;
 import jdbm.helper.StringComparator;
-import jdbm.helper.TupleBrowser;
 import jdbm.helper.Tuple;
-import jdbm.btree.BTree;
+import jdbm.helper.TupleBrowser;
 import jdbm.recman.BaseRecordManager;
 
-import java.io.File;
-import java.util.Comparator;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 
@@ -287,10 +287,6 @@ public class KeyBTreeCursorTest
         assertTrue( cursor.available() );
         cursor.last();
         assertTrue( cursor.available() );
-        
-        // Test isElementReused()
-        
-        assertFalse( cursor.isElementReused() );
     }
     
 

Modified: directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyCursorTest.java?rev=1136431&r1=1136430&r2=1136431&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyCursorTest.java (original)
+++ directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyCursorTest.java Thu Jun 16 13:31:25 2011
@@ -19,28 +19,28 @@
 package org.apache.directory.server.core.partition.impl.btree.jdbm;
 
 
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import java.io.File;
+import java.util.Comparator;
 
 import jdbm.RecordManager;
+import jdbm.btree.BTree;
 import jdbm.helper.StringComparator;
-import jdbm.helper.TupleBrowser;
 import jdbm.helper.Tuple;
-import jdbm.btree.BTree;
+import jdbm.helper.TupleBrowser;
 import jdbm.recman.BaseRecordManager;
 
-import java.io.File;
-import java.util.Comparator;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 
@@ -287,10 +287,6 @@ public class KeyCursorTest
         assertTrue( cursor.available() );
         cursor.last();
         assertTrue( cursor.available() );
-        
-        // Test isElementReused()
-        
-        assertFalse( cursor.isElementReused() );
     }
     
 

Modified: directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleArrayCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleArrayCursorTest.java?rev=1136431&r1=1136430&r2=1136431&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleArrayCursorTest.java (original)
+++ directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleArrayCursorTest.java Thu Jun 16 13:31:25 2011
@@ -24,8 +24,6 @@ import static junit.framework.Assert.ass
 
 import java.util.Comparator;
 
-import com.mycila.junit.concurrent.Concurrency;
-import com.mycila.junit.concurrent.ConcurrentJunitRunner;
 import org.apache.directory.server.core.avltree.ArrayTree;
 import org.apache.directory.shared.ldap.model.cursor.InvalidCursorPositionException;
 import org.apache.directory.shared.ldap.model.cursor.Tuple;
@@ -33,6 +31,9 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import com.mycila.junit.concurrent.Concurrency;
+import com.mycila.junit.concurrent.ConcurrentJunitRunner;
+
 /**
  * 
  * Test case for KeyTupleAvlCursor.
@@ -74,7 +75,6 @@ public class KeyTupleArrayCursorTest
         assertFalse( cursor.next() );
         assertFalse( cursor.available() );
         
-        assertTrue( cursor.isElementReused() );
         assertFalse( cursor.isClosed() );
         
         assertFalse( cursor.first() );

Modified: directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursorTest.java?rev=1136431&r1=1136430&r2=1136431&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursorTest.java (original)
+++ directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursorTest.java Thu Jun 16 13:31:25 2011
@@ -144,7 +144,6 @@ public class KeyTupleBTreeCursorTest
         assertFalse( cursor.next() );
         assertFalse( cursor.available() );
         
-        assertTrue( cursor.isElementReused() );
         assertFalse( cursor.isClosed() );
         
         assertFalse( cursor.first() );

Modified: directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursorTest.java?rev=1136431&r1=1136430&r2=1136431&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursorTest.java (original)
+++ directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursorTest.java Thu Jun 16 13:31:25 2011
@@ -139,7 +139,6 @@ public class NoDupsCursorTest
         
         assertFalse( cursor.available() );
         assertFalse( cursor.isClosed() );
-        assertTrue( cursor.isElementReused() );
 
         cursor = table.cursor();
         assertFalse( cursor.previous() );

Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaEventLogCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaEventLogCursor.java?rev=1136431&r1=1136430&r2=1136431&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaEventLogCursor.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaEventLogCursor.java Thu Jun 16 13:31:25 2011
@@ -98,12 +98,6 @@ class ReplicaEventLogCursor extends Abst
     }
 
 
-    public boolean isElementReused()
-    {
-        return false;
-    }
-
-
     public boolean last() throws Exception
     {
         throw new UnsupportedOperationException();

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexCursorAdaptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexCursorAdaptor.java?rev=1136431&r1=1136430&r2=1136431&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexCursorAdaptor.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexCursorAdaptor.java Thu Jun 16 13:31:25 2011
@@ -29,9 +29,9 @@ import org.apache.directory.server.xdbm.
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.model.cursor.ClosureMonitor;
 import org.apache.directory.shared.ldap.model.cursor.Cursor;
-import org.apache.directory.shared.ldap.model.cursor.TupleCursor;
 import org.apache.directory.shared.ldap.model.cursor.CursorIterator;
 import org.apache.directory.shared.ldap.model.cursor.Tuple;
+import org.apache.directory.shared.ldap.model.cursor.TupleCursor;
 
 
 /**
@@ -172,12 +172,6 @@ public class IndexCursorAdaptor<K, O, ID
     }
 
 
-    public boolean isElementReused()
-    {
-        return true;
-    }
-
-
     public final void setClosureMonitor( ClosureMonitor monitor )
     {
         wrappedCursor.setClosureMonitor( monitor );

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/ServerEntryCursorAdaptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/ServerEntryCursorAdaptor.java?rev=1136431&r1=1136430&r2=1136431&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/ServerEntryCursorAdaptor.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/ServerEntryCursorAdaptor.java Thu Jun 16 13:31:25 2011
@@ -153,15 +153,6 @@ public class ServerEntryCursorAdaptor<ID
 
 
     /* 
-     * @see Cursor#isElementReused()
-     */
-    public boolean isElementReused()
-    {
-        return indexCursor.isElementReused();
-    }
-
-
-    /* 
      * @see Cursor#last()
      */
     public boolean last() throws Exception

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/ValueArrayCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/ValueArrayCursor.java?rev=1136431&r1=1136430&r2=1136431&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/ValueArrayCursor.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/ValueArrayCursor.java Thu Jun 16 13:31:25 2011
@@ -24,9 +24,9 @@ import java.util.List;
 
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.model.cursor.AbstractCursor;
+import org.apache.directory.shared.ldap.model.cursor.InvalidCursorPositionException;
 import org.apache.directory.shared.ldap.model.cursor.Tuple;
 import org.apache.directory.shared.util.exception.NotImplementedException;
-import org.apache.directory.shared.ldap.model.cursor.InvalidCursorPositionException;
 
 
 /**
@@ -199,10 +199,4 @@ public class ValueArrayCursor<K, V> exte
 
         throw new InvalidCursorPositionException( I18n.err( I18n.ERR_701, pos, ( values.size() - 1 ) ) );
     }
-
-
-    public boolean isElementReused()
-    {
-        return true;
-    }
 }

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/EmptyIndexCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/EmptyIndexCursor.java?rev=1136431&r1=1136430&r2=1136431&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/EmptyIndexCursor.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/EmptyIndexCursor.java Thu Jun 16 13:31:25 2011
@@ -95,12 +95,6 @@ public class EmptyIndexCursor<K, E, ID> 
     }
 
 
-    public boolean isElementReused()
-    {
-        return false;
-    }
-
-
     public void afterValue( ID id, K indexValue ) throws Exception
     {
         checkNotClosed( "after()" );

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/SingletonIndexCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/SingletonIndexCursor.java?rev=1136431&r1=1136430&r2=1136431&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/SingletonIndexCursor.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/SingletonIndexCursor.java Thu Jun 16 13:31:25 2011
@@ -203,10 +203,4 @@ public class SingletonIndexCursor<K, E, 
             throw new InvalidCursorPositionException( I18n.err( I18n.ERR_706 ) );
         }
     }
-
-
-    public boolean isElementReused()
-    {
-        return true;
-    }
 }

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlTableDupsCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlTableDupsCursor.java?rev=1136431&r1=1136430&r2=1136431&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlTableDupsCursor.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlTableDupsCursor.java Thu Jun 16 13:31:25 2011
@@ -343,15 +343,6 @@ public class AvlTableDupsCursor<K,V> ext
     /**
      * {@inheritDoc}
      */
-    public boolean isElementReused()
-    {
-        return true;
-    }
-    
-
-    /**
-     * {@inheritDoc}
-     */
     public boolean last() throws Exception
     {
         checkNotClosed( "last()" );

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/AllEntriesCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/AllEntriesCursor.java?rev=1136431&r1=1136430&r2=1136431&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/AllEntriesCursor.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/AllEntriesCursor.java Thu Jun 16 13:31:25 2011
@@ -140,15 +140,6 @@ public class AllEntriesCursor<ID extends
 
 
     /* 
-     * @see org.apache.directory.server.core.cursor.Cursor#isElementReused()
-     */
-    public boolean isElementReused()
-    {
-        return true;
-    }
-
-
-    /* 
      * @see org.apache.directory.server.core.cursor.Cursor#last()
      */
     public boolean last() throws Exception

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/AndCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/AndCursor.java?rev=1136431&r1=1136430&r2=1136431&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/AndCursor.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/AndCursor.java Thu Jun 16 13:31:25 2011
@@ -162,12 +162,6 @@ public class AndCursor<V, ID> extends Ab
     }
 
 
-    public boolean isElementReused()
-    {
-        return wrapped.isElementReused();
-    }
-
-
     public void close() throws Exception
     {
         super.close();

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateCursor.java?rev=1136431&r1=1136430&r2=1136431&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateCursor.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateCursor.java Thu Jun 16 13:31:25 2011
@@ -254,17 +254,6 @@ public class ApproximateCursor<V, ID ext
     }
 
 
-    public boolean isElementReused()
-    {
-        if ( userIdxCursor != null )
-        {
-            return userIdxCursor.isElementReused();
-        }
-
-        return ndnIdxCursor.isElementReused();
-    }
-
-
     public void close() throws Exception
     {
         super.close();

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityCursor.java?rev=1136431&r1=1136430&r2=1136431&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityCursor.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityCursor.java Thu Jun 16 13:31:25 2011
@@ -255,17 +255,6 @@ public class EqualityCursor<V, ID extend
     }
 
 
-    public boolean isElementReused()
-    {
-        if ( userIdxCursor != null )
-        {
-            return userIdxCursor.isElementReused();
-        }
-
-        return ndnIdxCursor.isElementReused();
-    }
-
-
     public void close() throws Exception
     {
         super.close();

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqCursor.java?rev=1136431&r1=1136430&r2=1136431&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqCursor.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqCursor.java Thu Jun 16 13:31:25 2011
@@ -373,17 +373,6 @@ public class GreaterEqCursor<V, ID exten
     }
 
 
-    public boolean isElementReused()
-    {
-        if ( userIdxCursor != null )
-        {
-            return userIdxCursor.isElementReused();
-        }
-
-        return ndnIdxCursor.isElementReused();
-    }
-
-
     public void close() throws Exception
     {
         super.close();

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqCursor.java?rev=1136431&r1=1136430&r2=1136431&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqCursor.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqCursor.java Thu Jun 16 13:31:25 2011
@@ -401,17 +401,6 @@ public class LessEqCursor<V, ID extends 
     }
 
 
-    public boolean isElementReused()
-    {
-        if ( userIdxCursor != null )
-        {
-            return userIdxCursor.isElementReused();
-        }
-
-        return ndnIdxCursor.isElementReused();
-    }
-
-
     public void close() throws Exception
     {
         super.close();

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/NotCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/NotCursor.java?rev=1136431&r1=1136430&r2=1136431&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/NotCursor.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/NotCursor.java Thu Jun 16 13:31:25 2011
@@ -20,12 +20,12 @@
 package org.apache.directory.server.xdbm.search.impl;
 
 
-import org.apache.directory.server.xdbm.IndexEntry;
-import org.apache.directory.server.xdbm.Store;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.xdbm.AbstractIndexCursor;
 import org.apache.directory.server.xdbm.IndexCursor;
+import org.apache.directory.server.xdbm.IndexEntry;
+import org.apache.directory.server.xdbm.Store;
 import org.apache.directory.server.xdbm.search.Evaluator;
-import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.model.cursor.InvalidCursorPositionException;
 import org.apache.directory.shared.ldap.model.entry.Entry;
 import org.apache.directory.shared.ldap.model.filter.ExprNode;
@@ -157,12 +157,6 @@ public class NotCursor<V, ID extends Com
     }
 
 
-    public boolean isElementReused()
-    {
-        return ndnCursor.isElementReused();
-    }
-
-
     public void close() throws Exception
     {
         super.close();

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeCursor.java?rev=1136431&r1=1136430&r2=1136431&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeCursor.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeCursor.java Thu Jun 16 13:31:25 2011
@@ -21,10 +21,10 @@ package org.apache.directory.server.xdbm
 
 
 import org.apache.directory.server.i18n.I18n;
-import org.apache.directory.server.xdbm.IndexEntry;
-import org.apache.directory.server.xdbm.Store;
 import org.apache.directory.server.xdbm.AbstractIndexCursor;
 import org.apache.directory.server.xdbm.IndexCursor;
+import org.apache.directory.server.xdbm.IndexEntry;
+import org.apache.directory.server.xdbm.Store;
 import org.apache.directory.shared.ldap.model.cursor.Cursor;
 import org.apache.directory.shared.ldap.model.cursor.InvalidCursorPositionException;
 import org.apache.directory.shared.ldap.model.entry.Entry;
@@ -301,12 +301,6 @@ public class OneLevelScopeCursor<ID exte
     }
 
 
-    public boolean isElementReused()
-    {
-        return scopeCursor.isElementReused() || ( dereferencedCursor != null && dereferencedCursor.isElementReused() );
-    }
-
-
     @Override
     public void close() throws Exception
     {

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/OrCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/OrCursor.java?rev=1136431&r1=1136430&r2=1136431&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/OrCursor.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/OrCursor.java Thu Jun 16 13:31:25 2011
@@ -26,9 +26,9 @@ import java.util.List;
 import java.util.Set;
 
 import org.apache.directory.server.i18n.I18n;
-import org.apache.directory.server.xdbm.IndexEntry;
 import org.apache.directory.server.xdbm.AbstractIndexCursor;
 import org.apache.directory.server.xdbm.IndexCursor;
+import org.apache.directory.server.xdbm.IndexEntry;
 import org.apache.directory.server.xdbm.search.Evaluator;
 import org.apache.directory.shared.ldap.model.cursor.Cursor;
 import org.apache.directory.shared.ldap.model.cursor.InvalidCursorPositionException;
@@ -246,12 +246,6 @@ public class OrCursor<V, ID> extends Abs
     }
 
 
-    public boolean isElementReused()
-    {
-        return cursors.get( cursorIndex ).isElementReused();
-    }
-
-
     public void close() throws Exception
     {
         super.close();

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/PresenceCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/PresenceCursor.java?rev=1136431&r1=1136430&r2=1136431&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/PresenceCursor.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/PresenceCursor.java Thu Jun 16 13:31:25 2011
@@ -256,17 +256,6 @@ public class PresenceCursor<ID extends C
     }
 
 
-    public boolean isElementReused()
-    {
-        if ( presenceCursor != null )
-        {
-            return presenceCursor.isElementReused();
-        }
-
-        return ndnCursor.isElementReused();
-    }
-
-
     public void close() throws Exception
     {
         super.close();

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringCursor.java?rev=1136431&r1=1136430&r2=1136431&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringCursor.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringCursor.java Thu Jun 16 13:31:25 2011
@@ -226,12 +226,6 @@ public class SubstringCursor<ID extends 
     }
 
 
-    public boolean isElementReused()
-    {
-        return wrapped.isElementReused();
-    }
-
-
     public void close() throws Exception
     {
         super.close();

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeCursor.java?rev=1136431&r1=1136430&r2=1136431&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeCursor.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeCursor.java Thu Jun 16 13:31:25 2011
@@ -21,10 +21,10 @@ package org.apache.directory.server.xdbm
 
 
 import org.apache.directory.server.i18n.I18n;
-import org.apache.directory.server.xdbm.IndexEntry;
-import org.apache.directory.server.xdbm.Store;
 import org.apache.directory.server.xdbm.AbstractIndexCursor;
 import org.apache.directory.server.xdbm.IndexCursor;
+import org.apache.directory.server.xdbm.IndexEntry;
+import org.apache.directory.server.xdbm.Store;
 import org.apache.directory.shared.ldap.model.cursor.InvalidCursorPositionException;
 import org.apache.directory.shared.ldap.model.entry.Entry;
 
@@ -332,12 +332,6 @@ public class SubtreeScopeCursor<ID exten
     }
 
 
-    public boolean isElementReused()
-    {
-        return scopeCursor.isElementReused() || ( dereferencedCursor != null && dereferencedCursor.isElementReused() );
-    }
-
-
     private void closeCursors() throws Exception
     {
         if( dereferencedCursor != null )

Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/EmptyIndexCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/EmptyIndexCursorTest.java?rev=1136431&r1=1136430&r2=1136431&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/EmptyIndexCursorTest.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/EmptyIndexCursorTest.java Thu Jun 16 13:31:25 2011
@@ -77,13 +77,6 @@ public class EmptyIndexCursorTest
 
 
     @Test
-    public void testIsElementReused() throws Exception
-    {
-        assertFalse( indexCursor.isElementReused() );
-    }
-
-
-    @Test
     public void testBeforeFirst() throws Exception
     {
         indexCursor.beforeFirst();

Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/SingletonIndexCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/SingletonIndexCursorTest.java?rev=1136431&r1=1136430&r2=1136431&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/SingletonIndexCursorTest.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/SingletonIndexCursorTest.java Thu Jun 16 13:31:25 2011
@@ -108,13 +108,6 @@ public class SingletonIndexCursorTest
 
 
     @Test
-    public void testIsElementReused() throws Exception
-    {
-        assertTrue( indexCursor.isElementReused() );
-    }
-
-
-    @Test
     public void testBeforeFirst() throws Exception
     {
         // not explicitly positioned, implicit before first 

Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java?rev=1136431&r1=1136430&r2=1136431&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java Thu Jun 16 13:31:25 2011
@@ -267,8 +267,6 @@ public class AndCursorTest
         assertFalse( cursor.previous() );
         assertFalse( cursor.available() );
 
-        assertTrue( cursor.isElementReused() );
-
         try
         {
             cursor.get();

Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java?rev=1136431&r1=1136430&r2=1136431&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java Thu Jun 16 13:31:25 2011
@@ -170,7 +170,6 @@ public class GreaterEqTest
         GreaterEqCursor<String, Long> cursor = new GreaterEqCursor<String, Long>( store, evaluator );
         assertNotNull( cursor );
         assertFalse( cursor.available() );
-        assertTrue( cursor.isElementReused() );
         assertFalse( cursor.isClosed() );
 
         // ---------- test bad get() ----------
@@ -407,7 +406,6 @@ public class GreaterEqTest
         GreaterEqCursor<String, Long> cursor = new GreaterEqCursor<String, Long>( store, evaluator );
         assertNotNull( cursor );
         assertFalse( cursor.available() );
-        assertTrue( cursor.isElementReused() );
         assertFalse( cursor.isClosed() );
 
         // ---------- test bad get() ----------

Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java?rev=1136431&r1=1136430&r2=1136431&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java Thu Jun 16 13:31:25 2011
@@ -170,7 +170,6 @@ public class LessEqTest
         LessEqCursor<String, Long> cursor = new LessEqCursor<String, Long>( store, evaluator );
         assertNotNull( cursor );
         assertFalse( cursor.available() );
-        assertTrue( cursor.isElementReused() );
         assertFalse( cursor.isClosed() );
 
         // ---------- test bad get() ----------
@@ -427,7 +426,6 @@ public class LessEqTest
         LessEqCursor<String, Long> cursor = new LessEqCursor<String, Long>( store, evaluator );
         assertNotNull( cursor );
         assertFalse( cursor.available() );
-        assertTrue( cursor.isElementReused() );
         assertFalse( cursor.isClosed() );
 
         // ---------- test bad get() ----------

Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java?rev=1136431&r1=1136430&r2=1136431&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java Thu Jun 16 13:31:25 2011
@@ -40,9 +40,9 @@ import org.apache.directory.server.xdbm.
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.model.cursor.InvalidCursorPositionException;
 import org.apache.directory.shared.ldap.model.entry.Entry;
-import org.apache.directory.shared.ldap.model.filter.*;
-import org.apache.directory.shared.ldap.model.filter.NotNode;
 import org.apache.directory.shared.ldap.model.filter.ExprNode;
+import org.apache.directory.shared.ldap.model.filter.FilterParser;
+import org.apache.directory.shared.ldap.model.filter.NotNode;
 import org.apache.directory.shared.ldap.model.filter.SubstringNode;
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
 import org.apache.directory.shared.ldap.model.schema.syntaxCheckers.UuidSyntaxChecker;
@@ -244,8 +244,6 @@ public class NotCursorTest
         assertFalse( cursor.previous() );
         assertFalse( cursor.available() );
 
-        assertTrue( cursor.isElementReused() );
-
         try
         {
             cursor.get();

Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java?rev=1136431&r1=1136430&r2=1136431&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java Thu Jun 16 13:31:25 2011
@@ -160,8 +160,6 @@ public class OneLevelScopeTest
             node );
         OneLevelScopeCursor<Long> cursor = new OneLevelScopeCursor<Long>( store, evaluator );
 
-        assertTrue( cursor.isElementReused() );
-
         // --------- Test beforeFirst() ---------
 
         cursor.beforeFirst();
@@ -305,9 +303,6 @@ public class OneLevelScopeTest
         OneLevelScopeEvaluator<Entry, Long> evaluator = new OneLevelScopeEvaluator<Entry, Long>( store,
             node );
         OneLevelScopeCursor<Long> cursor = new OneLevelScopeCursor<Long>( store, evaluator );
-
-        assertTrue( cursor.isElementReused() );
-
         // --------- Test beforeFirst() ---------
 
         cursor.beforeFirst();
@@ -452,8 +447,6 @@ public class OneLevelScopeTest
             node );
         OneLevelScopeCursor<Long> cursor = new OneLevelScopeCursor<Long>( store, evaluator );
 
-        assertTrue( cursor.isElementReused() );
-
         // --------- Test beforeFirst() ---------
 
         cursor.beforeFirst();
@@ -577,8 +570,6 @@ public class OneLevelScopeTest
             node );
         OneLevelScopeCursor<Long> cursor = new OneLevelScopeCursor<Long>( store, evaluator );
 
-        assertTrue( cursor.isElementReused() );
-
         // --------- Test beforeFirst() ---------
 
         cursor.beforeFirst();
@@ -688,8 +679,6 @@ public class OneLevelScopeTest
             node );
         OneLevelScopeCursor<Long> cursor = new OneLevelScopeCursor<Long>( store, evaluator );
 
-        assertTrue( cursor.isElementReused() );
-
         // --------- Test beforeFirst() ---------
 
         cursor.beforeFirst();

Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java?rev=1136431&r1=1136430&r2=1136431&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java Thu Jun 16 13:31:25 2011
@@ -355,8 +355,6 @@ public class OrCursorTest
         assertFalse( cursor.previous() );
         assertFalse( cursor.available() );
 
-        assertTrue( cursor.isElementReused() );
-
         try
         {
             cursor.after( new ForwardIndexEntry() );

Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java?rev=1136431&r1=1136430&r2=1136431&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java Thu Jun 16 13:31:25 2011
@@ -154,7 +154,6 @@ public class PresenceTest
         PresenceCursor<Long> cursor = new PresenceCursor<Long>( store, evaluator );
 
         assertEquals( node, evaluator.getExpression() );
-        assertTrue( cursor.isElementReused() );
 
         cursor.beforeFirst();
         assertTrue( cursor.next() );
@@ -221,8 +220,6 @@ public class PresenceTest
         evaluator = new PresenceEvaluator<Long>( node, store, schemaManager );
         cursor = new PresenceCursor<Long>( store, evaluator );
 
-        assertTrue( cursor.isElementReused() );
-
         cursor.beforeFirst();
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
@@ -276,7 +273,6 @@ public class PresenceTest
         PresenceCursor<Long> cursor = new PresenceCursor<Long>( store, evaluator );
 
         assertEquals( node, evaluator.getExpression() );
-        assertTrue( cursor.isElementReused() );
 
         cursor.beforeFirst();
 
@@ -299,7 +295,6 @@ public class PresenceTest
         PresenceCursor<Long> cursor = new PresenceCursor<Long>( store, evaluator );
 
         assertEquals( node, evaluator.getExpression() );
-        assertTrue( cursor.isElementReused() );
 
         cursor.beforeFirst();
 
@@ -360,8 +355,6 @@ public class PresenceTest
         evaluator = new PresenceEvaluator<Long>( node, store, schemaManager );
         cursor = new PresenceCursor<Long>( store, evaluator );
 
-        assertTrue( cursor.isElementReused() );
-
         cursor.beforeFirst();
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );

Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java?rev=1136431&r1=1136430&r2=1136431&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java Thu Jun 16 13:31:25 2011
@@ -150,7 +150,6 @@ public class SubstringTest
         SubstringCursor<Long> cursor = new SubstringCursor<Long>( store, evaluator );
 
         assertEquals( node, evaluator.getExpression() );
-        assertTrue( cursor.isElementReused() );
 
         cursor.beforeFirst();
 
@@ -302,7 +301,6 @@ public class SubstringTest
         SubstringCursor<Long> cursor = new SubstringCursor<Long>( store, evaluator );
 
         assertEquals( node, evaluator.getExpression() );
-        assertTrue( cursor.isElementReused() );
 
         cursor.beforeFirst();
 
@@ -394,7 +392,6 @@ public class SubstringTest
         SubstringCursor<Long> cursor = new SubstringCursor<Long>( store, evaluator );
 
         assertEquals( node, evaluator.getExpression() );
-        assertTrue( cursor.isElementReused() );
 
         cursor.beforeFirst();
 
@@ -486,7 +483,6 @@ public class SubstringTest
         SubstringCursor<Long> cursor = new SubstringCursor<Long>( store, evaluator );
 
         assertEquals( node, evaluator.getExpression() );
-        assertTrue( cursor.isElementReused() );
 
         cursor.beforeFirst();
 
@@ -548,7 +544,6 @@ public class SubstringTest
         SubstringCursor<Long> cursor = new SubstringCursor<Long>( store, evaluator );
 
         assertEquals( node, evaluator.getExpression() );
-        assertTrue( cursor.isElementReused() );
 
         cursor.beforeFirst();
 

Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java?rev=1136431&r1=1136430&r2=1136431&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java Thu Jun 16 13:31:25 2011
@@ -159,8 +159,6 @@ public class SubtreeScopeTest
         SubtreeScopeEvaluator<Entry, Long> evaluator = new SubtreeScopeEvaluator<Entry, Long>( store, node );
         SubtreeScopeCursor<Long> cursor = new SubtreeScopeCursor<Long>( store, evaluator );
 
-        assertTrue( cursor.isElementReused() );
-
         // --------- Test beforeFirst() ---------
 
         cursor.beforeFirst();
@@ -317,8 +315,6 @@ public class SubtreeScopeTest
         SubtreeScopeEvaluator<Entry, Long> evaluator = new SubtreeScopeEvaluator<Entry, Long>( store, node );
         SubtreeScopeCursor<Long> cursor = new SubtreeScopeCursor<Long>( store, evaluator );
 
-        assertTrue( cursor.isElementReused() );
-
         // --------- Test beforeFirst() ---------
 
         cursor.beforeFirst();
@@ -505,8 +501,6 @@ public class SubtreeScopeTest
         SubtreeScopeEvaluator<Entry, Long> evaluator = new SubtreeScopeEvaluator<Entry, Long>( store, node );
         SubtreeScopeCursor<Long> cursor = new SubtreeScopeCursor<Long>( store, evaluator );
 
-        assertTrue( cursor.isElementReused() );
-
         // --------- Test beforeFirst() ---------
 
         cursor.beforeFirst();
@@ -650,8 +644,6 @@ public class SubtreeScopeTest
         SubtreeScopeEvaluator<Entry, Long> evaluator = new SubtreeScopeEvaluator<Entry, Long>( store, node );
         SubtreeScopeCursor<Long> cursor = new SubtreeScopeCursor<Long>( store, evaluator );
 
-        assertTrue( cursor.isElementReused() );
-
         // --------- Test beforeFirst() ---------
 
         cursor.beforeFirst();

Modified: directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/EntryCursorImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/EntryCursorImpl.java?rev=1136431&r1=1136430&r2=1136431&view=diff
==============================================================================
--- directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/EntryCursorImpl.java (original)
+++ directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/EntryCursorImpl.java Thu Jun 16 13:31:25 2011
@@ -144,15 +144,6 @@ public class EntryCursorImpl extends Abs
     /**
      * {@inheritDoc}
      */
-    public boolean isElementReused()
-    {
-        return true;
-    }
-
-
-    /**
-     * {@inheritDoc}
-     */
     public boolean available()
     {
         return searchCursor.available();

Modified: directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/SearchCursorImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/SearchCursorImpl.java?rev=1136431&r1=1136430&r2=1136431&view=diff
==============================================================================
--- directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/SearchCursorImpl.java (original)
+++ directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/SearchCursorImpl.java Thu Jun 16 13:31:25 2011
@@ -163,15 +163,6 @@ public class SearchCursorImpl extends Ab
     /**
      * {@inheritDoc}
      */
-    public boolean isElementReused()
-    {
-        return true;
-    }
-
-
-    /**
-     * {@inheritDoc}
-     */
     public boolean available()
     {
         return response != null;

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/cursor/Cursor.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/cursor/Cursor.java?rev=1136431&r1=1136430&r2=1136431&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/cursor/Cursor.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/cursor/Cursor.java Thu Jun 16 13:31:25 2011
@@ -215,21 +215,6 @@ public interface Cursor<E> extends Itera
 
 
     /**
-     * Gets whether or not this Cursor will return the same element object
-     * instance on get() operations for any position of this Cursor.  Some
-     * Cursor implementations may reuse the same element copying values into
-     * it for every position rather than creating and emit new element
-     * objects on each advance.  Some Cursor implementations may return
-     * different elements for each position yet the same element instance
-     * is returned for the same position. In these cases this method should
-     * return true.
-     *
-     * @return true if elements are reused by this Cursor
-     */
-    boolean isElementReused();
-
-
-    /**
      * Closes this Cursor and frees any resources it my have allocated.
      * Repeated calls to this method after this Cursor has already been
      * called should not fail with exceptions.

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/cursor/EmptyCursor.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/cursor/EmptyCursor.java?rev=1136431&r1=1136430&r2=1136431&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/cursor/EmptyCursor.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/cursor/EmptyCursor.java Thu Jun 16 13:31:25 2011
@@ -123,13 +123,4 @@ public class EmptyCursor<E> extends Abst
         checkNotClosed( "get()" );
         throw new InvalidCursorPositionException( I18n.err( I18n.ERR_02004_EMPTY_CURSOR ) );
     }
-
-
-    /**
-     * {@inheritDoc}
-     */
-    public boolean isElementReused()
-    {
-        return false;
-    }
 }

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/cursor/ListCursor.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/cursor/ListCursor.java?rev=1136431&r1=1136430&r2=1136431&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/cursor/ListCursor.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/cursor/ListCursor.java Thu Jun 16 13:31:25 2011
@@ -489,13 +489,4 @@ public class ListCursor<E> extends Abstr
 
         return list.get( index );
     }
-
-
-    /**
-     * {@inheritDoc}
-     */
-    public boolean isElementReused()
-    {
-        return true;
-    }
 }

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/cursor/SingletonCursor.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/cursor/SingletonCursor.java?rev=1136431&r1=1136430&r2=1136431&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/cursor/SingletonCursor.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/cursor/SingletonCursor.java Thu Jun 16 13:31:25 2011
@@ -313,13 +313,4 @@ public class SingletonCursor<E> extends 
             throw new InvalidCursorPositionException( I18n.err( I18n.ERR_02013_CANNOT_ACCESS_IF_AFTER_LAST ) );
         }
     }
-
-
-    /**
-     * {@inheritDoc}
-     */
-    public boolean isElementReused()
-    {
-        return true;
-    }
 }



Mime
View raw message