diff --git a/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/RouteController.java b/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/RouteController.java index 31ff7b804c62..9445d792e8b7 100644 --- a/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/RouteController.java +++ b/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/RouteController.java @@ -91,9 +91,13 @@ public ResponseEntity runWithSubpath( private Optional getSubPath(String path, String id) { String prefix = String.format("%s/%s/run/", RouteSchemaDescriptor.API_ENDPOINT, id); - if (path.startsWith(prefix)) { + + if (path.startsWith(prefix, 3)) { + return Optional.of(path.substring(prefix.length() + 3)); + } else if (path.startsWith(prefix)) { return Optional.of(path.substring(prefix.length())); } + return Optional.empty(); } }