Review fixes

ostis-apps · Oct 29, 2024 · 0a8c0a8 · 0a8c0a8
1 parent 651ae43
commit 0a8c0a8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/problem-solver/cxx/dialogControlModule/agent/StandardMessageReplyAgent.cpp b/problem-solver/cxx/dialogControlModule/agent/StandardMessageReplyAgent.cpp
@@ -17,17 +17,18 @@ ScResult StandardMessageReplyAgent::DoProgram(ScActionInitiatedEvent const & eve
   if (!messageNode.IsValid())
   {
     SC_AGENT_LOG_DEBUG("The action doesn't have a message node");
+    return action.FinishUnsuccessfully();
   }
 
   ScAddr logicRuleNode = generateReplyMessage(messageNode);
   ScAddr replyMessageNode = IteratorUtils::getAnyByOutRelation(&m_context, messageNode, MessageKeynodes::nrel_reply);
-  m_context.GenerateConnector(ScType::EdgeAccessConstPosPerm, MessageKeynodes::concept_message, replyMessageNode);
-
   if (!replyMessageNode.IsValid())
   {
     SC_AGENT_LOG_ERROR("The reply message isn't generated");
     return action.FinishUnsuccessfully();
   }
+
+  m_context.GenerateConnector(ScType::EdgeAccessConstPosPerm, MessageKeynodes::concept_message, replyMessageNode);
   SC_AGENT_LOG_DEBUG("The reply message is generated");
 
   initFields();

diff --git a/problem-solver/cxx/messageReplyModule/agent/MessageReplyAgent.cpp b/problem-solver/cxx/messageReplyModule/agent/MessageReplyAgent.cpp
@@ -53,9 +53,8 @@ ScResult MessageReplyAgent::DoProgram(ScActionInitiatedEvent const & event, ScAc
 
   ScAction actionToInterpret = m_context.GenerateAction(commonModule::Keynodes::action_interpret_non_atomic_action);
   actionToInterpret.SetArguments(processingProgramAddr, generateNonAtomicActionArgsSet(messageAddr));
-  actionToInterpret.InitiateAndWait(WAIT_TIME);
 
-  if (!actionToInterpret.IsFinishedSuccessfully())
+  if (!actionToInterpret.InitiateAndWait(WAIT_TIME) || !actionToInterpret.IsFinishedSuccessfully())
   {
     SC_AGENT_LOG_ERROR("Action wait time expired or action not finished successfully");
     return action.FinishUnsuccessfully();