root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

minor fix

This commit is contained in:
Andy Clement 2009-04-17 05:02:05 +00:00
parent d119411098
commit 9d6ae6c532
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/Projection.java
View File

@ -58,7 +58,6 @@ public class Projection extends SpelNodeImpl {
if (operand instanceof Map) { if (operand instanceof Map) {
Map<?, ?> mapdata = (Map<?, ?>) operand; Map<?, ?> mapdata = (Map<?, ?>) operand;
List<Object> result = new ArrayList<Object>(); List<Object> result = new ArrayList<Object>();
mapdata.entrySet();
for (Map.Entry entry : mapdata.entrySet()) { for (Map.Entry entry : mapdata.entrySet()) {
try { try {
state.pushActiveContextObject(new TypedValue(entry,TypeDescriptor.valueOf(Map.Entry.class))); state.pushActiveContextObject(new TypedValue(entry,TypeDescriptor.valueOf(Map.Entry.class)));
@ -67,7 +66,7 @@ public class Projection extends SpelNodeImpl {
state.popActiveContextObject(); state.popActiveContextObject();
} }
} }
return new TypedValue(result,TypeDescriptor.valueOf(Map.class)); // TODO unable to build correct type descriptor return new TypedValue(result,TypeDescriptor.valueOf(List.class)); // TODO unable to build correct type descriptor
} else if (operand instanceof List) { } else if (operand instanceof List) {
List<Object> data = new ArrayList<Object>(); List<Object> data = new ArrayList<Object>();
data.addAll((Collection<?>) operand); data.addAll((Collection<?>) operand);