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 2018/01/08 14:51:10 UTC
svn commit: r1820566 - in
/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal:
Debugger.java Interpreter.java SoftCache.java
Author: henrib
Date: Mon Jan 8 14:51:10 2018
New Revision: 1820566
URL: http://svn.apache.org/viewvc?rev=1820566&view=rev
Log:
JEXL:
Reducing FindBugs complaints
Modified:
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/Debugger.java
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/Interpreter.java
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/SoftCache.java
Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/Debugger.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/Debugger.java?rev=1820566&r1=1820565&r2=1820566&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/Debugger.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/Debugger.java Mon Jan 8 14:51:10 2018
@@ -636,8 +636,8 @@ public class Debugger extends ParserVisi
builder.append(") ");
acceptStatement(node.jjtGetChild(c + 1), data);
}
- // else...
- if (numChildren % 2 == 1) {
+ // else... (if odd)
+ if ((numChildren & 1) == 1) {
builder.append(" else ");
acceptStatement(node.jjtGetChild(numChildren - 1), data);
} else {
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=1820566&r1=1820565&r2=1820566&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 Mon Jan 8 14:51:10 2018
@@ -577,9 +577,9 @@ public class Interpreter extends Interpr
return node.jjtGetChild(ifElse + 1).jjtAccept(this, null);
}
}
- //
- if (numChildren % 2 == 1) {
- // if there is an else, there are an odd number of childrenin the statement and it is the last child,
+ // if odd...
+ if ((numChildren & 1) == 1) {
+ // if there is an else, there are an odd number of children in the statement and it is the last child,
// execute it.
result = node.jjtGetChild(numChildren - 1).jjtAccept(this, null);
}
@@ -1085,8 +1085,9 @@ public class Interpreter extends Interpr
boolean undefined = !(context.has(ant.toString()) || isLocalVariable(node, 0));
// variable unknown in context and not a local
return unsolvableVariable(node, ant.toString(), undefined);
- } else if (ptyNode != null) {
- return unsolvableProperty(node, ptyNode != null? ptyNode.toString() : "<null>.<?>", null);
+ }
+ if (ptyNode != null) {
+ return unsolvableProperty(node, ptyNode.toString(), null);
}
}
return object;
Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/SoftCache.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/SoftCache.java?rev=1820566&r1=1820565&r2=1820566&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/SoftCache.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/SoftCache.java Mon Jan 8 14:51:10 2018
@@ -136,7 +136,7 @@ public class SoftCache<K, V> {
final Set<Map.Entry<K, V>> set = map.entrySet();
final List<Map.Entry<K, V>> entries = new ArrayList<Map.Entry<K, V>>(set.size());
for (Map.Entry<K, V> e : set) {
- entries.add(new SoftCacheEntry(e));
+ entries.add(new SoftCacheEntry<K, V>(e));
}
return entries;
} finally {
@@ -161,7 +161,7 @@ public class SoftCache<K, V> {
@Override
protected boolean removeEldestEntry(Map.Entry<K, V> eldest) {
- return size() > cacheSize;
+ return super.size() > cacheSize;
}
};
}