Skip to content

Commit c89186f

Browse files
committed
avoid exception for disabling edge based CH config, fixes graphhopper#1538
1 parent f00960c commit c89186f

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

core/src/main/java/com/graphhopper/routing/ch/CHAlgoFactoryDecorator.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@
2323
import com.graphhopper.routing.util.TraversalMode;
2424
import com.graphhopper.routing.weighting.AbstractWeighting;
2525
import com.graphhopper.routing.weighting.Weighting;
26-
import com.graphhopper.storage.*;
26+
import com.graphhopper.storage.GraphHopperStorage;
27+
import com.graphhopper.storage.StorableProperties;
2728
import com.graphhopper.util.CmdArgs;
2829
import com.graphhopper.util.PMap;
2930
import com.graphhopper.util.Parameters;
@@ -32,7 +33,8 @@
3233
import org.slf4j.LoggerFactory;
3334

3435
import java.util.*;
35-
import java.util.concurrent.*;
36+
import java.util.concurrent.ExecutorCompletionService;
37+
import java.util.concurrent.ExecutorService;
3638

3739
import static com.graphhopper.util.Helper.*;
3840
import static com.graphhopper.util.Parameters.CH.DISABLE;
@@ -90,8 +92,9 @@ public void init(CmdArgs args) {
9092
if (enableThis)
9193
setDisablingAllowed(args.getBool(CH.INIT_DISABLING_ALLOWED, isDisablingAllowed()));
9294

93-
String edgeBasedCHStr = args.get(CH.PREPARE + "edge_based", "off");
94-
edgeBasedCHMode = EdgeBasedCHMode.valueOf(edgeBasedCHStr.trim().toUpperCase(Locale.ROOT));
95+
String edgeBasedCHStr = args.get(CH.PREPARE + "edge_based", "off").trim();
96+
edgeBasedCHStr = edgeBasedCHStr.equals("false") ? "off" : edgeBasedCHStr;
97+
edgeBasedCHMode = EdgeBasedCHMode.valueOf(edgeBasedCHStr.toUpperCase(Locale.ROOT));
9598

9699
pMap = args;
97100
}

0 commit comments

Comments
 (0)