Skip to content
Snippets Groups Projects
Commit 2408322a authored by Jan David Mol's avatar Jan David Mol
Browse files

Task #9487: Do not override already set itsQuitReason, and explain...

Task #9487: Do not override already set itsQuitReason, and explain EMERGENCY_TIMEOUT when reporting the error
parent 6248a700
No related branches found
No related tags found
No related merge requests found
......@@ -253,6 +253,10 @@ void ObservationControl::setState(CTState::CTstateNr newState)
message = "Lost connection(s)";
reportState = RTDB_OBJ_STATE_BROKEN;
break;
case CT_RESULT_EMERGENCY_TIMEOUT:
message = "Central controller did not die";
reportState = RTDB_OBJ_STATE_BROKEN;
break;
default:
message = formatString("Unknown reason(%d)", itsQuitReason);
reportState = RTDB_OBJ_STATE_BROKEN;
......@@ -544,7 +548,6 @@ GCFEvent::TResult ObservationControl::active_state(GCFEvent& event, GCFPortInter
itsQuitReason = CT_RESULT_EMERGENCY_TIMEOUT;
} else {
// JDM #9487: For stations, a loss of connection is NOT fatal
itsQuitReason = CT_RESULT_NO_ERROR;
}
TRAN(ObservationControl::finishing_state);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment