From 220c34fa87849a80bc68cd7f640d09c951aff684 Mon Sep 17 00:00:00 2001 From: asv Date: Thu, 27 Jan 2005 11:40:58 +0000 Subject: [PATCH] fix for PAL7849: GraphExecutor::OutNode::State( aNodeName ) will return "LoadingState" now only if the "true", internal state is "Running" state. --- src/GraphExecutor/DataFlowExecutor_OutNode.cxx | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/GraphExecutor/DataFlowExecutor_OutNode.cxx b/src/GraphExecutor/DataFlowExecutor_OutNode.cxx index 88e0cb3..e143daa 100644 --- a/src/GraphExecutor/DataFlowExecutor_OutNode.cxx +++ b/src/GraphExecutor/DataFlowExecutor_OutNode.cxx @@ -1518,10 +1518,12 @@ SUPERV::GraphState GraphExecutor::OutNode::State( const char * NodeName ) { if ( aCNode ) { GraphExecutor::InNode *anInNode = (GraphExecutor::InNode *)aCNode->GetInNode() ; if ( anInNode ) { - if ( anInNode->IsLoading() ) + aret = anInNode->State() ; + // asv 27.01.05 - fix for PAL7849, return "Loading" state only if internal state is SUPERV::RunningState + if ( ( aret == GraphExecutor::ExecutingState || + aret == GraphExecutor::ResumedExecutingState ) && + anInNode->IsLoading() ) aret = GraphExecutor::LoadingState; - else - aret = anInNode->State() ; // cdebug << "GraphExecutor::OutNode::State( " << NodeName << " ) " // << theAutomaton->StateName( AutomatonGraphState( aret ) ) << endl ; } -- 2.39.2