Skip to content

Commit 9022f78

Browse files
committed
custom profile: else can be null or empty string
1 parent 5c0c702 commit 9022f78

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

web-api/src/main/java/com/graphhopper/jackson/StatementDeserializer.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,10 @@ public Statement deserialize(JsonParser p, DeserializationContext ctxt) throws I
4141
else if (treeNode.has(ELSEIF.getName()))
4242
return Statement.ElseIf(treeNode.get(ELSEIF.getName()).asText(), jsonOp, value);
4343
else if (treeNode.has(ELSE.getName())) {
44-
if (!treeNode.get(ELSE.getName()).isNull())
45-
throw new IllegalArgumentException("else cannot have expression but was " + treeNode.get(ELSE.getName()));
46-
return Statement.Else(jsonOp, value);
44+
JsonNode elseNode = treeNode.get(ELSE.getName());
45+
if (elseNode.isNull() || elseNode.isValueNode() && elseNode.asText().isEmpty())
46+
return Statement.Else(jsonOp, value);
47+
throw new IllegalArgumentException("else cannot have expression but was " + treeNode.get(ELSE.getName()));
4748
}
4849

4950
throw new IllegalArgumentException("Cannot find if, else_if or else for " + treeNode.toString());

0 commit comments

Comments
 (0)