You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2013/09/19 08:38:10 UTC

svn commit: r1524630 - /struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/TextParseUtil.java

Author: lukaszlenart
Date: Thu Sep 19 06:38:10 2013
New Revision: 1524630

URL: http://svn.apache.org/r1524630
Log:
Removes duplicated conversion

Modified:
    struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/TextParseUtil.java

Modified: struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/TextParseUtil.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/TextParseUtil.java?rev=1524630&r1=1524629&r2=1524630&view=diff
==============================================================================
--- struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/TextParseUtil.java (original)
+++ struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/TextParseUtil.java Thu Sep 19 06:38:10 2013
@@ -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);
     }
 
     /**