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/03/29 22:50:08 UTC
svn commit: r1737049 -
/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasDeserializer.java
Author: schor
Date: Tue Mar 29 20:50:07 2016
New Revision: 1737049
URL: http://svn.apache.org/viewvc?rev=1737049&view=rev
Log:
[UIMA-4674] switch common built-in list getTail to getCommonTail
Modified:
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasDeserializer.java
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasDeserializer.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasDeserializer.java?rev=1737049&r1=1737048&r2=1737049&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasDeserializer.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasDeserializer.java Tue Mar 29 20:50:07 2016
@@ -1191,7 +1191,7 @@ public class XmiCasDeserializer {
CommonList node = theList;
while (node != null && (node instanceof NonEmptyList)) {
addNonsharedFSToEncompassingFSMapping((TOP) node, fs);
- node = node.getTail();
+ node = node.getCommonTail();
}
}
}
@@ -1361,7 +1361,7 @@ public class XmiCasDeserializer {
// existingList is non-empty
if (existingList instanceof FSList) {
FSList node = (FSList) existingList;
- FSList prevNode = null;
+ NonEmptyFSList prevNode = null;
for (int i = 0; i < valLen; i++) {
if (node instanceof EmptyList) { // never true initially due to above logic
@@ -1373,8 +1373,8 @@ public class XmiCasDeserializer {
NonEmptyFSList neNode = (NonEmptyFSList) node;
maybeSetFsListHead(values, i, neNode);
- prevNode = node;
- node = (FSList) node.getTail();
+ prevNode = (NonEmptyFSList) node;
+ node = prevNode.getTail();
}
// got to the end of the values, but the existing list has more elements
@@ -1396,7 +1396,7 @@ public class XmiCasDeserializer {
node.set_headFromString(values.get(i));
prevNode = node;
- node = node.getTail();
+ node = node.getCommonTail();
}
// got to the end of the values, but the existing list has more elements