GateControlList: Moved the configuration of the gates in the queueing…

… stage. The local stage was too early and could cause an error depending on submodule order.
inet-framework · Oct 12, 2023 · fcb003e · fcb003e
1 parent f7a57f3
commit fcb003e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/inet/queueing/gate/GateControlList.cc b/src/inet/queueing/gate/GateControlList.cc
@@ -21,7 +21,8 @@ void GateControlList::initialize(int stage)
         gateStates = check_and_cast<cValueArray *>(par("gateStates").objectValue());
 
         parseGcl();
-
+    }
+    else if (stage == INITSTAGE_QUEUEING) {
         for (int index = 0; index < numGates; ++index) {
             std::string modulePath = "^.transmissionGate[" + std::to_string(index) + "]";
             PeriodicGate *mod = check_and_cast<PeriodicGate *>(getModuleByPath(modulePath.c_str()));

diff --git a/src/inet/queueing/gate/GateControlList.h b/src/inet/queueing/gate/GateControlList.h
@@ -22,6 +22,7 @@ class INET_API GateControlList : public cSimpleModule
     cValueArray *gateStates = nullptr;
 
   protected:
+    virtual int numInitStages() const override { return NUM_INIT_STAGES; }
     virtual void initialize(int stage) override;
     virtual void handleMessage(cMessage *msg) override;