Commits

Anonymous committed f0ee075

removed crap we don't use anymore

git-svn-id: http://svn.opensymphony.com/svn/xwork/trunk/src@61e221344d-f017-0410-9bd5-d282ab1896d7

Comments (0)

Files changed (1)

java/com/opensymphony/xwork/util/XWorkConverter.java

                 OgnlContext ognlContext = (OgnlContext) context;
                 Evaluation eval = ognlContext.getCurrentEvaluation();
 
-                if (eval == null) {
-                    eval = ognlContext.getLastEvaluation();
-
-                    // since the upgrade to ognl-2.6.3.jar, eval is null here
-                    // and this null check was being caoucht by an outer try/catch which ignored it !
-                    if (eval != null) {
-                        clazz = eval.getResult().getClass();
-                        property = (String) eval.getLastChild().getResult();
-                    }
-                } else {
+                if (eval != null) {
                     // since we changed what the source was (tricked Ognl essentially)
                     clazz = eval.getLastChild().getSource().getClass();