You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by cw...@apache.org on 2013/02/13 22:04:07 UTC
svn commit: r1445924 -
/uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/AggregateAnalysisEngineController_impl.java
Author: cwiklik
Date: Wed Feb 13 21:04:06 2013
New Revision: 1445924
URL: http://svn.apache.org/r1445924
Log:
UIMA-2668 Fixed CAS accounting to prevent NPE
Modified:
uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/AggregateAnalysisEngineController_impl.java
Modified: uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/AggregateAnalysisEngineController_impl.java
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/AggregateAnalysisEngineController_impl.java?rev=1445924&r1=1445923&r2=1445924&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/AggregateAnalysisEngineController_impl.java (original)
+++ uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/AggregateAnalysisEngineController_impl.java Wed Feb 13 21:04:06 2013
@@ -1794,8 +1794,8 @@ public class AggregateAnalysisEngineCont
"finalStep",
UIMAEE_Constants.JMS_LOG_RESOURCE_BUNDLE,
"UIMAEE_cas_decremented_child_count__FINE",
- new Object[] { getComponentName(), casStateEntry.getCasReferenceId(),
- casStateEntry.getSubordinateCasInPlayCount() });
+ new Object[] { getComponentName(), parentCasStateEntry.getCasReferenceId(),
+ parentCasStateEntry.getSubordinateCasInPlayCount() });
}
}
}
@@ -2125,9 +2125,9 @@ public class AggregateAnalysisEngineCont
// Modify the parent of this CAS.
if (inputCasId != null ) {
if ( !inputCasId.equals(casStateEntry.getInputCasReferenceId())) {
- casStateEntry.setInputCasReferenceId(inputCasId);
cacheEntry.setInputCasReferenceId(inputCasId);
}
+ // Update counters in the parents controller local cache.
CasStateEntry parentCasStateEntry =
parentController.getLocalCache().lookupEntry(inputCasId);
if ( parentCasStateEntry != null ) {