aboutsummaryrefslogtreecommitdiff
path: root/velocity-engine-core/src/main/java/org/apache/velocity/runtime
diff options
context:
space:
mode:
authorClaude Brisson <cbrisson@apache.org>2018-11-01 12:20:31 +0000
committerClaude Brisson <cbrisson@apache.org>2018-11-01 12:20:31 +0000
commitb3418f7745a21e4a18278cf13ba66880be9e2858 (patch)
treeab97210e0d4b83fe9e1f37d22aa5b587a4608f1a /velocity-engine-core/src/main/java/org/apache/velocity/runtime
parentd3766959902b91690a21c1a397a619b08d6e143e (diff)
downloadapache-velocity-engine-b3418f7745a21e4a18278cf13ba66880be9e2858.tar.gz
[engine] Bugfix for alternate values
git-svn-id: https://svn.apache.org/repos/asf/velocity/engine/trunk@1845457 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'velocity-engine-core/src/main/java/org/apache/velocity/runtime')
-rw-r--r--velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTReference.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTReference.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTReference.java
index 1b80e989..c02a82a0 100644
--- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTReference.java
+++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTReference.java
@@ -389,7 +389,7 @@ public class ASTReference extends SimpleNode
/*
* Time to try the alternate value if needed
*/
- if (astAlternateValue != null && (result == null || DuckType.asBoolean(result, checkEmpty)))
+ if (astAlternateValue != null && (result == null || !DuckType.asBoolean(result, checkEmpty)))
{
result = astAlternateValue.value(context);
}