Author: lukaszlenart
Date: Tue Jul 30 20:47:01 2013
New Revision: 1508625
URL: http://svn.apache.org/r1508625
Log:
WW-4138 Solves problem with NPE when passed expression is null
Modified:
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/OgnlTextParser.java
Modified:
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/OgnlTextParser.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/OgnlTextParser.java?rev=1508625&r1=1508624&r2=1508625&view=diff
==============================================================================
---
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/OgnlTextParser.java
(original)
+++
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/OgnlTextParser.java
Tue Jul 30 20:47:01 2013
@@ -10,7 +10,7 @@ public class OgnlTextParser implements T
public Object evaluate(char[] openChars, String expression,
TextParseUtil.ParsedValueEvaluator evaluator, int maxLoopCount) {
// deal with the "pure" expressions first!
//expression = expression.trim();
- Object result = expression;
+ Object result = expression = (expression == null) ? "" : expression;
int pos = 0;
for (char open : openChars) {
