diff --git a/src/main/java/org/opentripplanner/routing/impl/InputStreamGraphSource.java b/src/main/java/org/opentripplanner/routing/impl/InputStreamGraphSource.java index e353783e5df..e2dbc8f0d65 100644 --- a/src/main/java/org/opentripplanner/routing/impl/InputStreamGraphSource.java +++ b/src/main/java/org/opentripplanner/routing/impl/InputStreamGraphSource.java @@ -223,12 +223,14 @@ private Router loadGraph() { // Even if a config file is not present on disk one could be bundled inside. try (InputStream is = streams.getConfigInputStream()) { JsonNode config = MissingNode.getInstance(); + // TODO reuse the exact same JSON loader from OTPConfigurator + ObjectMapper mapper = new ObjectMapper(); + mapper.configure(JsonParser.Feature.ALLOW_COMMENTS, true); + mapper.configure(JsonParser.Feature.ALLOW_UNQUOTED_FIELD_NAMES, true); if (is != null) { - // TODO reuse the exact same JSON loader from OTPConfigurator - ObjectMapper mapper = new ObjectMapper(); - mapper.configure(JsonParser.Feature.ALLOW_COMMENTS, true); - mapper.configure(JsonParser.Feature.ALLOW_UNQUOTED_FIELD_NAMES, true); config = mapper.readTree(is); + } else if (newGraph.routerConfig != null) { + config = mapper.readTree(newGraph.routerConfig); } Router newRouter = new Router(routerId, newGraph); newRouter.startup(config);