Index: src/main/java/org/springframework/extensions/surf/ModelObjectService.java
================================================== =================
--- src/main/java/org/springframework/extensions/surf/ModelObjectService.java (revision 496)
+++ src/main/java/org/springframework/extensions/surf/ModelObjectService.java (working copy)
@@ -23,6 +23,7 @@
import java.util.Comparator;
import java.util.HashMap;
import java.util.Iterator;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Vector;
@@ -717,8 +718,8 @@
}
});

- // Clear the map
- map.clear();
+ // Use LinkedHashMap to retain insertion order
+ map = new LinkedHashMap<String, ModelObject>(list.size());

// Copy back the entries now in order
for (Map.Entry<String, ModelObject> entry: list)