Merge pull request #8808 from ktf/fix-restart

ktf · web-flow · commit 1830b03f541f · 2022-05-13T00:32:40.000+02:00
DPL: make FairMQDeviceProxy::bindChannels idem-potent
diff --git a/Framework/Core/src/FairMQDeviceProxy.cxx b/Framework/Core/src/FairMQDeviceProxy.cxx
@@ -125,6 +125,14 @@ std::unique_ptr<FairMQMessage> FairMQDeviceProxy::createInputMessage(RouteIndex
 
 void FairMQDeviceProxy::bind(std::vector<OutputRoute> const& outputs, std::vector<InputRoute> const& inputs, fair::mq::Device& device)
 {
+  mOutputs.clear();
+  mOutputRoutes.clear();
+  mOutputChannels.clear();
+  mOutputChannelNames.clear();
+  mInputs.clear();
+  mInputRoutes.clear();
+  mInputChannels.clear();
+  mInputChannelNames.clear();
   {
     mOutputs = outputs;
     mOutputRoutes.reserve(outputs.size());

Original file line number	Diff line number	Diff line change
`@@ -125,6 +125,14 @@ std::unique_ptr<FairMQMessage> FairMQDeviceProxy::createInputMessage(RouteIndex`
`125`	`125`
`126`	`126`	`void FairMQDeviceProxy::bind(std::vector<OutputRoute> const& outputs, std::vector<InputRoute> const& inputs, fair::mq::Device& device)`
`127`	`127`	`{`
	`128`	`+ mOutputs.clear();`
	`129`	`+ mOutputRoutes.clear();`
	`130`	`+ mOutputChannels.clear();`
	`131`	`+ mOutputChannelNames.clear();`
	`132`	`+ mInputs.clear();`
	`133`	`+ mInputRoutes.clear();`
	`134`	`+ mInputChannels.clear();`
	`135`	`+ mInputChannelNames.clear();`
`128`	`136`	`{`
`129`	`137`	`mOutputs = outputs;`
`130`	`138`	`mOutputRoutes.reserve(outputs.size());`