You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2016/05/06 20:15:50 UTC

svn commit: r1742610 - /uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_aggregation_common.java

Author: schor
Date: Fri May  6 20:15:50 2016
New Revision: 1742610

URL: http://svn.apache.org/viewvc?rev=1742610&view=rev
Log:
[UIMA-4674] minor performance tweaks.

Modified:
    uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_aggregation_common.java

Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_aggregation_common.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_aggregation_common.java?rev=1742610&r1=1742609&r2=1742610&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_aggregation_common.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_aggregation_common.java Fri May  6 20:15:50 2016
@@ -42,7 +42,7 @@ import org.apache.uima.cas.Type;
 class FsIterator_aggregation_common<T extends FeatureStructure> 
           implements LowLevelIterator<T> {
   
-  final private FSIterator<T>[] iterators;
+  final private FSIterator<T>[] iterators; // not just for single-type iterators
   
   private int lastValidIndex;
   
@@ -117,7 +117,7 @@ class FsIterator_aggregation_common<T ex
     }
     
     FSIterator<T> it = iterators[lastValidIndex];
-    it.moveToNext();
+    it.moveToNextNvc();
 
     if (it.isValid()) {
       return;
@@ -161,8 +161,14 @@ class FsIterator_aggregation_common<T ex
       return;
     }
     
+    moveToPreviousNvc();
+  }
+  
+  @Override
+  public void moveToPreviousNvc() {
+    
     FSIterator<T> it = iterators[lastValidIndex];
-    it.moveToPrevious();
+    it.moveToPreviousNvc();
 
     if (it.isValid()) {
       return;