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 2015/01/13 22:16:19 UTC
svn commit: r1651497 -
/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CasSerializerSupport.java
Author: schor
Date: Tue Jan 13 21:16:18 2015
New Revision: 1651497
URL: http://svn.apache.org/r1651497
Log:
[UIMA-4179] plus other minor tweaks
Modified:
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CasSerializerSupport.java
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CasSerializerSupport.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CasSerializerSupport.java?rev=1651497&r1=1651496&r2=1651497&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CasSerializerSupport.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CasSerializerSupport.java Tue Jan 13 21:16:18 2015
@@ -38,7 +38,6 @@ import org.apache.uima.internal.util.Int
import org.apache.uima.internal.util.PositiveIntSet;
import org.apache.uima.internal.util.PositiveIntSet_impl;
import org.apache.uima.internal.util.XmlElementName;
-import org.apache.uima.util.Level;
import org.apache.uima.util.Logger;
import org.apache.uima.util.MessageReport;
import org.xml.sax.ContentHandler;
@@ -452,8 +451,7 @@ public class CasSerializerSupport {
public int getSofaAddr(int sofaNum) {
if (sofaNum != 1 || cas.isInitialSofaCreated()) { //skip if initial view && no Sofa yet
// all non-initial-views must have a sofa
- FeatureStructureImpl sofa = (FeatureStructureImpl) cas.getView(sofaNum).getSofa();
- return sofa.getAddress();
+ return ((CASImpl)cas.getView(sofaNum)).getSofaRef();
}
return 0;
}
@@ -654,7 +652,8 @@ public class CasSerializerSupport {
private int enqueueCommon(int addr, boolean doDeltaAndFilteringCheck) {
- final int typeCode = cas.getHeapValue(addr);
+ final int typeCode = cas.getHeapValue(addr);
+ assert(typeCode != 0);
if (doDeltaAndFilteringCheck) {
if (isDelta) {
if (!marker.isNew(addr) && !marker.isModified(addr)) {