You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by he...@apache.org on 2019/10/28 14:40:06 UTC
[commons-jexl] branch master updated: JEXL: getting ready for 3.2,
gitbox/github sync
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 074de11 JEXL: getting ready for 3.2, gitbox/github sync
074de11 is described below
commit 074de115f6fc4479c58ebd5540b411f22c0a4249
Author: henrib <he...@apache.org>
AuthorDate: Mon Oct 28 15:39:25 2019 +0100
JEXL: getting ready for 3.2, gitbox/github sync
---
pom.xml | 2 +-
src/main/config/checkstyle.xml | 12 ++++++------
.../org/apache/commons/jexl3/internal/InterpreterBase.java | 7 ++++++-
3 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/pom.xml b/pom.xml
index b52a569..b6d7123 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,7 +53,7 @@
<commons.jira.id>JEXL</commons.jira.id>
<commons.jira.pid>12310479</commons.jira.pid>
<checkstyle.plugin.version>2.17</checkstyle.plugin.version>
- <checksyle.version>6.13</checksyle.version>
+ <checksyle.version>8.18</checksyle.version>
</properties>
<scm>
diff --git a/src/main/config/checkstyle.xml b/src/main/config/checkstyle.xml
index 7742077..fdc0761 100644
--- a/src/main/config/checkstyle.xml
+++ b/src/main/config/checkstyle.xml
@@ -207,13 +207,13 @@
<module name="UpperEll"/>
<!-- used for suppression comment filter -->
- <module name="FileContentsHolder"/>
- </module>
- <module name="SuppressionCommentFilter">
- <property name="offCommentFormat" value="CSOFF\: ([\w\|]+)"/>
- <property name="onCommentFormat" value="CSON\: ([\w\|]+)"/>
- <property name="checkFormat" value="$1"/>
+ <module name="SuppressionCommentFilter">
+ <property name="offCommentFormat" value="CSOFF\: ([\w\|]+)"/>
+ <property name="onCommentFormat" value="CSON\: ([\w\|]+)"/>
+ <property name="checkFormat" value="$1"/>
+ </module>
</module>
+
</module>
diff --git a/src/main/java/org/apache/commons/jexl3/internal/InterpreterBase.java b/src/main/java/org/apache/commons/jexl3/internal/InterpreterBase.java
index 832bd10..7727d55 100644
--- a/src/main/java/org/apache/commons/jexl3/internal/InterpreterBase.java
+++ b/src/main/java/org/apache/commons/jexl3/internal/InterpreterBase.java
@@ -540,7 +540,12 @@ public abstract class InterpreterBase extends ParserVisitor {
* @return false if already cancelled, true otherwise
*/
protected boolean cancel() {
- return cancelled? false : (cancelled = true);
+ if (cancelled) {
+ return false;
+ } else {
+ cancelled = true;
+ return true;
+ }
}
/**