DPL: fix DDS config generation with empty --channel-prefix (#4887)

ktf · web-flow · commit 859c35c5313e · 2020-11-22T16:44:53.000+01:00
diff --git a/Framework/Core/src/DDSConfigHelpers.cxx b/Framework/Core/src/DDSConfigHelpers.cxx
@@ -46,6 +46,13 @@ void dumpDeviceSpec2DDS(std::ostream& out,
         ai++;
         continue;
       }
+      // If channel-prefix is empty do not print it out
+      if (strcmp(arg, "--channel-prefix") == 0 &&
+          ai + 1 < execution.args.size() &&
+          *execution.args[ai + 1] == 0) {
+        ai++;
+        continue;
+      }
       out << arg << " ";
     }
     out << "--plugin-search-path $FAIRMQ_ROOT/lib --plugin dds";

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,13 @@ void dumpDeviceSpec2DDS(std::ostream& out,`
`46`	`46`	`ai++;`
`47`	`47`	`continue;`
`48`	`48`	`}`
	`49`	`+ // If channel-prefix is empty do not print it out`
	`50`	`+ if (strcmp(arg, "--channel-prefix") == 0 &&`
	`51`	`+ ai + 1 < execution.args.size() &&`
	`52`	`+ *execution.args[ai + 1] == 0) {`
	`53`	`+ ai++;`
	`54`	`+ continue;`
	`55`	`+ }`
`49`	`56`	`out << arg << " ";`
`50`	`57`	`}`
`51`	`58`	`out << "--plugin-search-path $FAIRMQ_ROOT/lib --plugin dds";`