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 2016/02/23 19:04:41 UTC
svn commit: r1731917 -
/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/Interpreter.java
Author: henrib
Date: Tue Feb 23 18:04:40 2016
New Revision: 1731917
URL: http://svn.apache.org/viewvc?rev=1731917&view=rev
Log:
JEXL:
Fixing JEXL-189 using logical or (and avoiding masking the interruption status)
Modified:
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/Interpreter.java
Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/Interpreter.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/Interpreter.java?rev=1731917&r1=1731916&r2=1731917&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/Interpreter.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/Interpreter.java Tue Feb 23 18:04:40 2016
@@ -347,7 +347,7 @@ public class Interpreter extends ParserV
* @return true if cancelled, false otherwise
*/
protected boolean isCancelled() {
- if (cancelled | Thread.interrupted()) {
+ if (cancelled || Thread.currentThread().isInterrupted()) {
cancelled = true;
}
return cancelled;