This is an automated email from the ASF dual-hosted git repository. cbrisson pushed a commit to branch VELOCITY-957 in repository https://gitbox.apache.org/repos/asf/velocity-engine.git
commit ca1e9e1c9bf3c63575995e8976932c3f987985b4 Author: Claude Brisson <[email protected]> AuthorDate: Sat Aug 24 14:01:56 2024 +0200 Fix overzealous string to number conversion in comparison --- .../org/apache/velocity/runtime/parser/node/ASTComparisonNode.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTComparisonNode.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTComparisonNode.java index 88656ecc..5dbebae3 100644 --- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTComparisonNode.java +++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTComparisonNode.java @@ -76,7 +76,10 @@ public abstract class ASTComparisonNode extends ASTBinaryOperator { return compareNull(left, right); } - Boolean result = compareNumbers(left, right); + Boolean result = null; + if (!(left instanceof String) || !(right instanceof String)) { + result = compareNumbers(left, right); + } if (result == null) { result = compareNonNumber(left, right);
