This is an automated email from the ASF dual-hosted git repository.
henrib pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-jexl.git
The following commit(s) were added to refs/heads/master by this push:
new 9ca1d67 JEXL-302, JEXL-306: changes and release notes
9ca1d67 is described below
commit 9ca1d67c316fa38652dc5376358e802d3336a285
Author: Henri Biestro <hbies...@gmail.com>
AuthorDate: Sat Jun 8 15:45:17 2019 +0200
JEXL-302, JEXL-306: changes and release notes
---
RELEASE-NOTES.txt | 2 ++
src/main/java/org/apache/commons/jexl3/internal/Engine.java | 2 +-
src/site/xdoc/changes.xml | 6 ++++++
3 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index b345cd7..9d01ebe 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -72,9 +72,11 @@ New Features in 3.2:
Bugs Fixed in 3.2:
==================
+* JEXL-306: Ternary operator ? protects also its branches from resolution
errors
* JEXL-305: Script debugger produces incorrect syntax
* JEXL-304: Error parsing overview.limit.var
* JEXL-303: Block syntax is broken
+* JEXL-302: JexlScript.getVariables returns strange values for array
access
* JEXL-301: Array access operator does not fail on null object in
non-strict arithmetic mode
* JEXL-300: Ant-ish variables should not use safe-access operator syntax
* JEXL-299: Improve message error when method could not be found
diff --git a/src/main/java/org/apache/commons/jexl3/internal/Engine.java
b/src/main/java/org/apache/commons/jexl3/internal/Engine.java
index a98af2e..d731140 100644
--- a/src/main/java/org/apache/commons/jexl3/internal/Engine.java
+++ b/src/main/java/org/apache/commons/jexl3/internal/Engine.java
@@ -170,7 +170,7 @@ public class Engine extends JexlEngine {
this.strict = option(conf.strict(), true);
this.safe = option(conf.safe(), false);
this.silent = option(conf.silent(), false);
- this.cancellable = option(conf.cancellable(), !silent && strict );
+ this.cancellable = option(conf.cancellable(), !silent && strict);
this.debug = option(conf.debug(), true);
this.collectAll = option(conf.collectAll(), true);
this.stackOverflow = conf.stackOverflow() > 0? conf.stackOverflow() :
Integer.MAX_VALUE;
diff --git a/src/site/xdoc/changes.xml b/src/site/xdoc/changes.xml
index c0af7bc..709b5ac 100644
--- a/src/site/xdoc/changes.xml
+++ b/src/site/xdoc/changes.xml
@@ -26,6 +26,9 @@
</properties>
<body>
<release version="3.2" date="unreleased">
+ <action dev="henrib" type="fix" issue="JEXL-306" due-to="Dmitri
Blinov">
+ Ternary operator ? protects also its branches from resolution
errors
+ </action>
<action dev="henrib" type="fix" issue="JEXL-305" due-to="Dmitri
Blinov">
Script debugger produces incorrect syntax
</action>
@@ -35,6 +38,9 @@
<action dev="henrib" type="fix" issue="JEXL-303" due-to="Dmitri
Blinov">
Block syntax is broken
</action>
+ <action dev="henrib" type="fix" issue="JEXL-302" due-to="Dmitri
Blinov">
+ JexlScript.getVariables returns strange values for array access
+ </action>
<action dev="henrib" type="fix" issue="JEXL-301" due-to="Dmitri
Blinov">
Array access operator does not fail on null object in
non-strict arithmetic mode
</action>
