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 2010/06/29 16:05:25 UTC
svn commit: r958973 -
/uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/AggregateAnalysisEngineController_impl.java
Author: cwiklik
Date: Tue Jun 29 14:05:24 2010
New Revision: 958973
URL: http://svn.apache.org/viewvc?rev=958973&view=rev
Log:
UIMA-1820 Updates parent CAS child count in replyToClient()
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=958973&r1=958972&r2=958973&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 Tue Jun 29 14:05:24 2010
@@ -1594,7 +1594,6 @@ public class AggregateAnalysisEngineCont
UIMAEE_Constants.JMS_LOG_RESOURCE_BUNDLE,
"UIMAEE_cas_has_children__FINE",
new Object[] { getComponentName(), casStateEntry.getCasReferenceId(),
- casStateEntry.getCasReferenceId(),
casStateEntry.getSubordinateCasInPlayCount() });
}
@@ -1972,9 +1971,16 @@ public class AggregateAnalysisEngineCont
// Find the top ancestor of this CAS. It is the input CAS sent by the client
String inputCasId = getLocalCache().lookupInputCasReferenceId(casStateEntry);
// Modify the parent of this CAS.
- if (inputCasId != null && !inputCasId.equals(casStateEntry.getInputCasReferenceId())) {
- casStateEntry.setInputCasReferenceId(inputCasId);
- cacheEntry.setInputCasReferenceId(inputCasId);
+ if (inputCasId != null ) {
+ if ( !inputCasId.equals(casStateEntry.getInputCasReferenceId())) {
+ casStateEntry.setInputCasReferenceId(inputCasId);
+ cacheEntry.setInputCasReferenceId(inputCasId);
+ }
+ CasStateEntry parentCasStateEntry =
+ parentController.getLocalCache().lookupEntry(inputCasId);
+ if ( parentCasStateEntry != null ) {
+ parentCasStateEntry.incrementSubordinateCasInPlayCount();
+ }
}
}
// Send CAS to a given reply endpoint