Update DefaultControlFlowConfigurator.java

key: GEOS-6037 and GEOS-6040