You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by al...@apache.org on 2007/09/18 18:10:53 UTC
svn commit: r576968 -
/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasDeserializer.java
Author: alally
Date: Tue Sep 18 09:10:52 2007
New Revision: 576968
URL: http://svn.apache.org/viewvc?rev=576968&view=rev
Log:
UIMA-578: fix XmiCasDeserializer merging of Sofas
https://issues.apache.org/jira/browse/UIMA-578
Modified:
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasDeserializer.java
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasDeserializer.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasDeserializer.java?rev=576968&r1=576967&r2=576968&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasDeserializer.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasDeserializer.java Tue Sep 18 09:10:52 2007
@@ -220,6 +220,10 @@
// clear ID mappings stored in the SharedData (from previous deserializations)
this.sharedData.clearIdMap();
+ //new Sofas start at 2
+ this.nextSofaNum = 2;
+ } else {
+ this.nextSofaNum = ((CASImpl)this.casBeingFilled).getBaseSofaCount() + 1; //TODO: check with Eddie
}
this.deserializedFsAddrs = new IntVector();
this.fsListNodesFromMultivaluedProperties = new IntVector();
@@ -245,7 +249,6 @@
this.sofaTypeCode = tsOfReceivingCas.ll_getCodeForTypeName(CAS.TYPE_NAME_SOFA);
this.sofaNumFeatCode = tsOfReceivingCas.ll_getCodeForFeatureName(CAS.FEATURE_FULL_NAME_SOFANUM);
this.sofaFeatCode = tsOfReceivingCas.ll_getCodeForFeatureName(CAS.FEATURE_FULL_NAME_SOFA);
- this.nextSofaNum = 2;
this.listUtils = new ListUtils(casBeingFilled, UIMAFramework.getLogger(XmiCasDeserializer.class), null);
// populate feature type table