fix for PAL7849: GraphExecutor::OutNode::State( aNodeName ) will return "LoadingState...

diff --git a/src/GraphExecutor/DataFlowExecutor_OutNode.cxx b/src/GraphExecutor/DataFlowExecutor_OutNode.cxx
index 88e0cb374d9f361f831df5b685a4061bd74a7e8b..e143daabe3be55c00c8df8107b305b104a6e2798 100644 (file)
--- 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 ;
     }