Race condition between Active and default scenario

[svettwer]

Given the following Test of sample-combined:

@CitrusTest
    public void testInterveningRequest() {
        variable("correlationId", "citrus:randomNumber(10)");

        //GoodNightScenario
        http().client(simulatorClient)
                .send()
                .post("goodnight")
                .payload("<GoodNight xmlns=\"http://citrusframework.org/schemas/hello\">" +
                            "Go to sleep!" +
                        "</GoodNight>")
                .header("x-correlationid", "${correlationId}");

        http().client(simulatorClient)
                .receive()
                .response(HttpStatus.OK)
                .payload("<GoodNightResponse xmlns=\"http://citrusframework.org/schemas/hello\">" +
                            "Good Night!" +
                        "</GoodNightResponse>");

        //DefaultScenario
        http().client(simulatorClient)
                .send()
                .post()
                .payload("<InterveningRequest>In between!</InterveningRequest>");

        http().client(simulatorClient)
                .receive()
                .response(HttpStatus.OK)
                .payload(defaultResponse);

        //GoodNightScenario
        http().client(simulatorClient)
                .send()
                .post()
                .payload("<InterveningRequest>In between!</InterveningRequest>")
                .header("x-correlationid", "${correlationId}");

        http().client(simulatorClient)
                .receive()
                .response(HttpStatus.OK)
                .payload("<InterveningResponse>In between!</InterveningResponse>");

        //Should be DefaultScenario (Race condition here)
        http().client(simulatorClient)
                .send()
                .put("goodnight")
                .payload("<InterveningRequest>In between!</InterveningRequest>")
                .header("x-correlationid", "${correlationId}");

        http().client(simulatorClient)
                .receive()
                .response(HttpStatus.OK)
                .payload(defaultResponse);
    }

If the test runs "fast enough", the GoodNightScenario is still active in the CorrelationHandlerRegistry, because doFinally().actions(builder.stop()) of the ScenarioDesigner, containing the StopCorrelationHandlerAction to stop the scenario, has not been finished, until the next request, that matches the x-correlationid header condition, arrives.

BR,
Sven