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/06/30 16:09:58 UTC
svn commit: r789746 -
/incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/PrimitiveAnalysisEngineController_impl.java
Author: cwiklik
Date: Tue Jun 30 14:09:58 2009
New Revision: 789746
URL: http://svn.apache.org/viewvc?rev=789746&view=rev
Log:
UIMA-1391 Modified to return input CAS when a stop is received from a client
Modified:
incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/PrimitiveAnalysisEngineController_impl.java
Modified: incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/PrimitiveAnalysisEngineController_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/PrimitiveAnalysisEngineController_impl.java?rev=789746&r1=789745&r2=789746&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/PrimitiveAnalysisEngineController_impl.java (original)
+++ incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/PrimitiveAnalysisEngineController_impl.java Tue Jun 30 14:09:58 2009
@@ -457,9 +457,12 @@
}
}
if ( casAbortedDueToExternalRequest ) {
+
// The controller was told to stop generating new CASes. Just return the input CAS to the
// client
- throw new ResourceProcessException(new InterruptedException("Cas Multiplier:"+getComponentName()+" Aborted CAS:"+aCasReferenceId));
+ //throw new ResourceProcessException(new InterruptedException("Cas Multiplier:"+getComponentName()+" Aborted CAS:"+aCasReferenceId));
+
+ break; // break out of the cas producing loop and return an input CAS to the client
} else {
// The controller is stopping
return;
@@ -579,13 +582,14 @@
// Send reply back to the client. Use internal (non-jms) transport
if ( !stopped ) {
transport.getUimaMessageDispatcher(anEndpoint.getEndpoint()).dispatch(message);
- }
+ }
}
else
{
if ( !stopped ) {
getOutputChannel().sendReply(aCasReferenceId, anEndpoint);
}
+
inputCASReturned = true;
}
// Remove input CAS state entry from the local cache