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/25 14:57:30 UTC
svn commit: r1745498 - in
/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas:
FSArray.java NonEmptyFSList.java NonEmptyFloatList.java
NonEmptyIntegerList.java NonEmptyStringList.java
Author: schor
Date: Wed May 25 14:57:29 2016
New Revision: 1745498
URL: http://svn.apache.org/viewvc?rev=1745498&view=rev
Log:
[UIMA-4674] add check when setting FS ref into fs array or list, that the fs is in the same CAS.
Modified:
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSArray.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyFSList.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyFloatList.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyIntegerList.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyStringList.java
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSArray.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSArray.java?rev=1745498&r1=1745497&r2=1745498&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSArray.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSArray.java Wed May 25 14:57:29 2016
@@ -20,6 +20,7 @@
package org.apache.uima.jcas.cas;
import org.apache.uima.cas.ArrayFS;
+import org.apache.uima.cas.CASRuntimeException;
import org.apache.uima.cas.FeatureStructure;
import org.apache.uima.cas.impl.CASImpl;
import org.apache.uima.cas.impl.TypeImpl;
@@ -95,7 +96,12 @@ public final class FSArray extends TOP i
/** updates the Cas, setting the indexed value with the corresponding Cas FeatureStructure. */
public void set(int i, FeatureStructure v) {
- theArray[i] = (TOP) v;
+ TOP vt = (TOP) v;
+ if (v != null && _casView.getBaseCAS() != vt._casView.getBaseCAS()) {
+ /** Feature Structure {0} belongs to CAS {1}, may not be set as the value of an array or list element in a different CAS {2}.*/
+ throw new CASRuntimeException(CASRuntimeException.FS_NOT_MEMBER_OF_CAS, vt, vt._casView, _casView);
+ }
+ theArray[i] = vt;
_casView.maybeLogArrayUpdate(this, null, i);
}
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyFSList.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyFSList.java?rev=1745498&r1=1745497&r2=1745498&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyFSList.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyFSList.java Wed May 25 14:57:29 2016
@@ -19,6 +19,7 @@
package org.apache.uima.jcas.cas;
+import org.apache.uima.cas.CASRuntimeException;
import org.apache.uima.cas.impl.CASImpl;
import org.apache.uima.cas.impl.FeatureImpl;
import org.apache.uima.cas.impl.TypeImpl;
@@ -68,7 +69,12 @@ public class NonEmptyFSList extends FSLi
public TOP getHead() { return _getFeatureValueNc(_FI_head); }
/* setter for head * */
- public void setHead(TOP v) { _setFeatureValueNcWj(_FI_head, v); }
+ public void setHead(TOP v) {
+ if (v != null && _casView.getBaseCAS() != v._casView.getBaseCAS()) {
+ /** Feature Structure {0} belongs to CAS {1}, may not be set as the value of an array or list element in a different CAS {2}.*/
+ throw new CASRuntimeException(CASRuntimeException.FS_NOT_MEMBER_OF_CAS, v, v._casView, _casView);
+ }
+ _setFeatureValueNcWj(_FI_head, v); }
// public void _setHeadNcNj(TOP v) { _F_head = v; }
@@ -78,7 +84,12 @@ public class NonEmptyFSList extends FSLi
public FSList getTail() { return (FSList) _getFeatureValueNc(_FI_tail); }
/* setter for tail * */
- public void setTail(FSList v) { _setFeatureValueNcWj(_FI_tail, v); }
+ public void setTail(FSList v) {
+ if (v != null && _casView.getBaseCAS() != v._casView.getBaseCAS()) {
+ /** Feature Structure {0} belongs to CAS {1}, may not be set as the value of an array or list element in a different CAS {2}.*/
+ throw new CASRuntimeException(CASRuntimeException.FS_NOT_MEMBER_OF_CAS, v, v._casView, _casView);
+ }
+ _setFeatureValueNcWj(_FI_tail, v); }
@Override
public void setTail(CommonList v) {
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyFloatList.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyFloatList.java?rev=1745498&r1=1745497&r2=1745498&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyFloatList.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyFloatList.java Wed May 25 14:57:29 2016
@@ -19,6 +19,7 @@
package org.apache.uima.jcas.cas;
+import org.apache.uima.cas.CASRuntimeException;
import org.apache.uima.cas.impl.CASImpl;
import org.apache.uima.cas.impl.TypeImpl;
import org.apache.uima.cas.impl.TypeSystemImpl;
@@ -79,7 +80,13 @@ public class NonEmptyFloatList extends F
public FloatList getTail() { return (FloatList) _getFeatureValueNc(_FI_tail); }
/* setter for tail * */
- public void setTail(FloatList v) { _setFeatureValueNcWj(_FI_tail, v); }
+ public void setTail(FloatList v) {
+ if (v != null && _casView.getBaseCAS() != v._casView.getBaseCAS()) {
+ /** Feature Structure {0} belongs to CAS {1}, may not be set as the value of an array or list element in a different CAS {2}.*/
+ throw new CASRuntimeException(CASRuntimeException.FS_NOT_MEMBER_OF_CAS, v, v._casView, _casView);
+ }
+ _setFeatureValueNcWj(_FI_tail, v);
+ }
public void setTail(CommonList v) { setTail((FloatList) v); }
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyIntegerList.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyIntegerList.java?rev=1745498&r1=1745497&r2=1745498&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyIntegerList.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyIntegerList.java Wed May 25 14:57:29 2016
@@ -21,6 +21,7 @@ package org.apache.uima.jcas.cas;
import java.util.List;
+import org.apache.uima.cas.CASRuntimeException;
import org.apache.uima.cas.impl.CASImpl;
import org.apache.uima.cas.impl.TypeImpl;
import org.apache.uima.cas.impl.TypeSystemImpl;
@@ -82,10 +83,16 @@ public class NonEmptyIntegerList extends
public IntegerList getTail() { return (IntegerList) _getFeatureValueNc(_FI_tail); }
/* setter for tail * */
- public void setTail(IntegerList v) { _setFeatureValueNcWj(_FI_tail, v); }
+ public void setTail(IntegerList v) {
+ if (v != null && _casView.getBaseCAS() != v._casView.getBaseCAS()) {
+ /** Feature Structure {0} belongs to CAS {1}, may not be set as the value of an array or list element in a different CAS {2}.*/
+ throw new CASRuntimeException(CASRuntimeException.FS_NOT_MEMBER_OF_CAS, v, v._casView, _casView);
+ }
+ _setFeatureValueNcWj(_FI_tail, v);
+ }
@Override
- public void setTail(CommonList v) { setTail((IntegerList)v); }
+ public void setTail(CommonList v) {setTail((IntegerList)v);}
public void setHead(List<String> stringValues, int i) {
setHead(Integer.parseInt(stringValues.get(i)));
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyStringList.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyStringList.java?rev=1745498&r1=1745497&r2=1745498&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyStringList.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyStringList.java Wed May 25 14:57:29 2016
@@ -19,6 +19,7 @@
package org.apache.uima.jcas.cas;
+import org.apache.uima.cas.CASRuntimeException;
import org.apache.uima.cas.impl.CASImpl;
import org.apache.uima.cas.impl.TypeImpl;
import org.apache.uima.cas.impl.TypeSystemImpl;
@@ -79,7 +80,13 @@ public class NonEmptyStringList extends
public StringList getTail() { return (StringList) _getFeatureValueNc(_FI_tail); }
/* setter for tail * */
- public void setTail(StringList v) { _setFeatureValueNcWj(_FI_tail, v); }
+ public void setTail(StringList v) {
+ if (v != null && _casView.getBaseCAS() != v._casView.getBaseCAS()) {
+ /** Feature Structure {0} belongs to CAS {1}, may not be set as the value of an array or list element in a different CAS {2}.*/
+ throw new CASRuntimeException(CASRuntimeException.FS_NOT_MEMBER_OF_CAS, v, v._casView, _casView);
+ }
+ _setFeatureValueNcWj(_FI_tail, v);
+ }
@Override
public void setTail(CommonList v) {