From 3ec7b8ca226987c74595495a16860b89732fad8a Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Tue, 17 Jan 2012 18:14:19 +0000 Subject: [PATCH] WW-3743 - removes unnecessary second call to getProperty() and removes some unused code git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1232518 13f79535-47bb-0310-9956-ffa450edef68 --- .../xwork2/ognl/accessor/XWorkMapPropertyAccessor.java | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/accessor/XWorkMapPropertyAccessor.java b/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/accessor/XWorkMapPropertyAccessor.java index b7d3c10b7..2737970f2 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/accessor/XWorkMapPropertyAccessor.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/accessor/XWorkMapPropertyAccessor.java @@ -88,14 +88,7 @@ public class XWorkMapPropertyAccessor extends MapPropertyAccessor { String lastProperty = (String) context.get(XWorkConverter.LAST_BEAN_PROPERTY_ACCESSED); if (lastClass == null || lastProperty == null) { - return super.getProperty(context, target, name); - } - Class keyClass = objectTypeDeterminer - .getKeyClass(lastClass, lastProperty); - - if (keyClass == null) { - - keyClass = java.lang.String.class; + return null; } Object key = getKey(context, name); Map map = (Map) target;