From 4c45a9433bae5fe3fcad5acd95e4f437e548d075 Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Thu, 19 Sep 2013 06:38:10 +0000 Subject: [PATCH] Removes duplicated conversion git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1524630 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/com/opensymphony/xwork2/util/TextParseUtil.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/TextParseUtil.java b/xwork-core/src/main/java/com/opensymphony/xwork2/util/TextParseUtil.java index fb24eb10a..4b54e81e4 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/util/TextParseUtil.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/util/TextParseUtil.java @@ -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); } /**