mirror of
https://github.com/apache/struts.git
synced 2026-08-07 15:46:57 +00:00
Removes duplicated conversion
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1524630 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
@@ -16,7 +16,6 @@
|
||||
package com.opensymphony.xwork2.util;
|
||||
|
||||
import com.opensymphony.xwork2.ActionContext;
|
||||
import com.opensymphony.xwork2.conversion.impl.XWorkConverter;
|
||||
import com.opensymphony.xwork2.inject.Container;
|
||||
|
||||
import java.util.HashSet;
|
||||
@@ -165,11 +164,7 @@ public class TextParseUtil {
|
||||
|
||||
TextParser parser = ((Container)stack.getContext().get(ActionContext.CONTAINER)).getInstance(TextParser.class);
|
||||
|
||||
XWorkConverter conv = ((Container)stack.getContext().get(ActionContext.CONTAINER)).getInstance(XWorkConverter.class);
|
||||
|
||||
Object result = parser.evaluate(openChars, expression, ognlEval, maxLoopCount);
|
||||
|
||||
return conv.convertValue(stack.getContext(), result, asType);
|
||||
return parser.evaluate(openChars, expression, ognlEval, maxLoopCount);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user