diff options
| author | Georgios Andreadis <g.andreadis@student.tudelft.nl> | 2020-03-12 09:34:17 +0100 |
|---|---|---|
| committer | Georgios Andreadis <g.andreadis@student.tudelft.nl> | 2020-03-12 09:34:17 +0100 |
| commit | a84c548300ad5e58eb3d5067e6ded4bea26828ff (patch) | |
| tree | 0baf82ea28ea98bbbbfa24f623c6ebb5a34ed81e /opendc/opendc-experiments-sc20/src | |
| parent | 7665c089ac44166f284d5757087ea1e7b3bc0a2d (diff) | |
| parent | b8b1e64c957671890ba4cacfaf9d26e5d1b2c812 (diff) | |
Merge branch '2.x-single-quote-fix' into '2.x'
Fix edge case where selected VM list contains an escaped single quote in a VM name
See merge request opendc/opendc-simulator!40
Diffstat (limited to 'opendc/opendc-experiments-sc20/src')
| -rw-r--r-- | opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/TestExperiment.kt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/TestExperiment.kt b/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/TestExperiment.kt index f5c98160..ffdf0529 100644 --- a/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/TestExperiment.kt +++ b/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/TestExperiment.kt @@ -53,7 +53,11 @@ class ExperimentParameters(parser: ArgParser) { val outputFile by parser.storing("path to where the output should be stored") .default { "sc20-experiment-results.csv" } val selectedVms by parser.storing("the VMs to run") { - val vms: List<String> = jacksonObjectMapper().readValue(this.replace('\'', '"')) + // Handle case where VM list contains a VM name with an (escaped) single-quote in it + val string = this.replace("\\'", "\\\\[") + .replace("'", "\"") + .replace("\\\\[", "'") + val vms: List<String> = jacksonObjectMapper().readValue(string) vms } .default { |