You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2018/07/02 20:41:06 UTC
svn commit: r1834893 -
/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/impl/FlowContainer.java
Author: schor
Date: Mon Jul 2 20:41:06 2018
New Revision: 1834893
URL: http://svn.apache.org/viewvc?rev=1834893&view=rev
Log:
[UIMA-5097] merge from trunk, make resets to componentInfo more reliable.
Modified:
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/impl/FlowContainer.java
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/impl/FlowContainer.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/impl/FlowContainer.java?rev=1834893&r1=1834892&r2=1834893&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/impl/FlowContainer.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/impl/FlowContainer.java Mon Jul 2 20:41:06 2018
@@ -55,12 +55,12 @@ public class FlowContainer {
mCAS = (CASImpl)aCAS;
}
- public FlowContainer newCasProduced(CAS newCAS, String producedBy)
+ public FlowContainer newCasProduced(final CAS newCAS, String producedBy)
throws AnalysisEngineProcessException {
mTimer.startIt();
CAS view = null;
try {
- view = Util.getStartingView(
+ view = Util.getStartingView(
newCAS,
mSofaAware,
mFlowControllerContainer.getUimaContextAdmin().getComponentInfo());
@@ -81,9 +81,9 @@ public class FlowContainer {
} catch (CASException e) {
throw new AnalysisEngineProcessException(e);
} finally {
+ newCAS.setCurrentComponentInfo(null);
if (null != view) {
((CASImpl)view).restoreClassLoaderUnlockCas();
- view.setCurrentComponentInfo(null);
}
mTimer.stopIt();
getMBean().reportAnalysisTime(mTimer.getDuration());