You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by eb...@apache.org on 2017/03/25 00:14:47 UTC
svn commit: r1788579 -
/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/TemplateEngine.java
Author: ebourg
Date: Sat Mar 25 00:14:47 2017
New Revision: 1788579
URL: http://svn.apache.org/viewvc?rev=1788579&view=rev
Log:
Minor simplification, the cache is guaranteed to be never null
Modified:
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/TemplateEngine.java
Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/TemplateEngine.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/TemplateEngine.java?rev=1788579&r1=1788578&r2=1788579&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/TemplateEngine.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/TemplateEngine.java Sat Mar 25 00:14:47 2017
@@ -659,14 +659,10 @@ public final class TemplateEngine extend
Exception xuel = null;
TemplateExpression stmt = null;
try {
- if (cache == null) {
+ stmt = cache.get(expression);
+ if (stmt == null) {
stmt = parseExpression(info, expression, null);
- } else {
- stmt = cache.get(expression);
- if (stmt == null) {
- stmt = parseExpression(info, expression, null);
- cache.put(expression, stmt);
- }
+ cache.put(expression, stmt);
}
} catch (JexlException xjexl) {
xuel = new Exception(xjexl.getInfo(), "failed to parse '" + expression + "'", xjexl);