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 2009/05/29 20:58:31 UTC
svn commit: r780070 - in
/incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/java/org/apache/uima/aae:
controller/AggregateAnalysisEngineController_impl.java
error/handler/ProcessCasErrorHandler.java
handler/input/ProcessRequestHandler_impl.java
Author: cwiklik
Date: Fri May 29 18:58:30 2009
New Revision: 780070
URL: http://svn.apache.org/viewvc?rev=780070&view=rev
Log:
UIMA-1358 Modified to return to the client the input CAS ID in the reply msg containing an exception
Modified:
incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/AggregateAnalysisEngineController_impl.java
incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/java/org/apache/uima/aae/error/handler/ProcessCasErrorHandler.java
incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/java/org/apache/uima/aae/handler/input/ProcessRequestHandler_impl.java
Modified: incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/AggregateAnalysisEngineController_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/AggregateAnalysisEngineController_impl.java?rev=780070&r1=780069&r2=780070&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/AggregateAnalysisEngineController_impl.java (original)
+++ incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/AggregateAnalysisEngineController_impl.java Fri May 29 18:58:30 2009
@@ -2412,7 +2412,13 @@
for( int i=0; cachedEntries != null && i < cachedEntries.length; i++ )
{
String casReferenceId = cachedEntries[i].getCasReferenceId();
- String parentCasReferenceId = cachedEntries[i].getInputCasReferenceId();
+ String parentCasReferenceId = null;
+ try {
+ CasStateEntry parentEntry = getLocalCache().getTopCasAncestor(casReferenceId);//cachedEntries[i].getInputCasReferenceId();
+ if (parentEntry != null ) {
+ parentCasReferenceId = parentEntry.getCasReferenceId();
+ }
+ } catch ( Exception e) {}
getInProcessCache().getEndpoint(anEndpoint, casReferenceId).cancelTimer();
Endpoint requestOrigin = cachedEntries[i].getMessageOrigin();
try
Modified: incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/java/org/apache/uima/aae/error/handler/ProcessCasErrorHandler.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/java/org/apache/uima/aae/error/handler/ProcessCasErrorHandler.java?rev=780070&r1=780069&r2=780070&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/java/org/apache/uima/aae/error/handler/ProcessCasErrorHandler.java (original)
+++ incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/java/org/apache/uima/aae/error/handler/ProcessCasErrorHandler.java Fri May 29 18:58:30 2009
@@ -148,7 +148,8 @@
try {
stateEntry = aController.getLocalCache().lookupEntry(aCasReferenceId);
if ( stateEntry != null && stateEntry.isSubordinate()) {
- parentCasReferenceId = stateEntry.getInputCasReferenceId();
+ CasStateEntry topParentEntry = aController.getLocalCache().getTopCasAncestor(aCasReferenceId);
+ parentCasReferenceId = topParentEntry.getCasReferenceId();
}
} catch ( Exception e){}
aController.getOutputChannel().sendReply(t, aCasReferenceId, parentCasReferenceId, anEndpoint, AsynchAEMessage.Process);
Modified: incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/java/org/apache/uima/aae/handler/input/ProcessRequestHandler_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/java/org/apache/uima/aae/handler/input/ProcessRequestHandler_impl.java?rev=780070&r1=780069&r2=780070&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/java/org/apache/uima/aae/handler/input/ProcessRequestHandler_impl.java (original)
+++ incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/java/org/apache/uima/aae/handler/input/ProcessRequestHandler_impl.java Fri May 29 18:58:30 2009
@@ -83,7 +83,8 @@
try {
stateEntry = getController().getLocalCache().lookupEntry(casReferenceId);
if ( stateEntry != null && stateEntry.isSubordinate()) {
- parentCasReferenceId = stateEntry.getInputCasReferenceId();
+ CasStateEntry topParentEntry = getController().getLocalCache().getTopCasAncestor(casReferenceId);
+ parentCasReferenceId = topParentEntry.getCasReferenceId();
}
} catch ( Exception e){}