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 2017/01/13 15:02:32 UTC

svn commit: r1778607 - in /uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/internal/util: CopyOnWriteObjHashSet.java CopyOnWriteOrderedFsSet_array.java

Author: schor
Date: Fri Jan 13 15:02:32 2017
New Revision: 1778607

URL: http://svn.apache.org/viewvc?rev=1778607&view=rev
Log:
no Jira - name change to indicate copy on write for index parts are read only

Modified:
    uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/internal/util/CopyOnWriteObjHashSet.java
    uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/internal/util/CopyOnWriteOrderedFsSet_array.java

Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/internal/util/CopyOnWriteObjHashSet.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/internal/util/CopyOnWriteObjHashSet.java?rev=1778607&r1=1778606&r2=1778607&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/internal/util/CopyOnWriteObjHashSet.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/internal/util/CopyOnWriteObjHashSet.java Fri Jan 13 15:02:32 2017
@@ -41,8 +41,8 @@ public class CopyOnWriteObjHashSet<T> im
    * Called by index when about to make an update
    */
   @Override
-  public void makeCopy() {
-    ohs = new ObjHashSet<>(ohs);
+  public void makeReadOnlyCopy() {
+    ohs = new ObjHashSet<>(ohs, true); // true - read-only copy
   }
   
   /*****************************************************

Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/internal/util/CopyOnWriteOrderedFsSet_array.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/internal/util/CopyOnWriteOrderedFsSet_array.java?rev=1778607&r1=1778606&r2=1778607&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/internal/util/CopyOnWriteOrderedFsSet_array.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/internal/util/CopyOnWriteOrderedFsSet_array.java Fri Jan 13 15:02:32 2017
@@ -30,7 +30,6 @@ import java.util.stream.Stream;
 
 import org.apache.uima.cas.impl.CopyOnWriteIndexPart;
 import org.apache.uima.jcas.cas.TOP;
-import org.apache.uima.internal.util.OrderedFsSet_array;
 
 /**
  * implements OrderedFsSet_array partially, for iterator use
@@ -51,10 +50,11 @@ public class CopyOnWriteOrderedFsSet_arr
 
   /**
    * Called by index when about to make an update
+   * This copy captures the state of things before the update happens
    */
   @Override
-  public void makeCopy() {
-    set = new OrderedFsSet_array(set);
+  public void makeReadOnlyCopy() {
+    set = new OrderedFsSet_array(set, true); // true = make read only copy
   }
 
   /**