From ddd5ec7de5ad6f521e1ca772c71f24cd5a9b24d6 Mon Sep 17 00:00:00 2001 From: rahuel Date: Tue, 13 Feb 2007 09:03:18 +0000 Subject: [PATCH] NPAL14110 : If in the graph a node do a Shutdown of Container(s) and if we activate the "Reload Dataflow" button, nodes of that Container(s) were aborted because of a Call of CpuUsed_impl in the compoenet(s). Now the exception is catched but the status of the nodes is not changed. --- src/GraphExecutor/DataFlowExecutor_InNode.cxx | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/GraphExecutor/DataFlowExecutor_InNode.cxx b/src/GraphExecutor/DataFlowExecutor_InNode.cxx index ac74281..bd312f4 100644 --- a/src/GraphExecutor/DataFlowExecutor_InNode.cxx +++ b/src/GraphExecutor/DataFlowExecutor_InNode.cxx @@ -1689,10 +1689,18 @@ const long GraphExecutor::InNode::CpuUsed( bool tot ) { cpu = Component()->CpuUsed_impl() ; } catch ( ... ) { - cdebug << "CpuUsed " << Name() << " --> Component()->CpuUsed_impl() ERROR catched " - << endl ; - State( GraphExecutor::ErroredState ) ; - _OutNode->State( GraphExecutor::ErroredState ) ; + if ( _OutNode->IsDone() ) { + cdebug << "CpuUsed " << Name() << " --> Component()->CpuUsed_impl() WARNING catched Graph is done " + << Automaton()->StateName( _OutNode->State() ) << endl ; + } + else { + cdebug << "CpuUsed " << Name() << " --> Component()->CpuUsed_impl() WARNING catched " + << Automaton()->StateName( _OutNode->State() ) << endl ; +//JR NPAL14110 09.02.2007 : If there is a shutdown of components ===> NodeState must not +// be aborted ... ==> Commented : + //JRState( GraphExecutor::ErroredState ) ; + //JR_OutNode->State( GraphExecutor::ErroredState ) ; + } cpu = -1 ; } } -- 2.39.2