From 61a5ab9d34d635caf4c6b041113e15dbe7b47a01 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@vmware.com>
Date: Mon, 28 Nov 2011 14:42:03 +0000
Subject: [PATCH] fixed "formMultiSelect"/"formCheckboxes" FreeMarker macros to
 compare against actual field value (SPR-7721)

---
 .../springframework/web/servlet/view/freemarker/spring.ftl    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/freemarker/spring.ftl b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/freemarker/spring.ftl
index d72dbc39b0..502f99f2e6 100644
--- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/freemarker/spring.ftl
+++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/freemarker/spring.ftl
@@ -246,7 +246,7 @@
     <@bind path/>
     <select multiple="multiple" id="${status.expression}" name="${status.expression}" ${attributes}>
         <#list options?keys as value>
-        <#assign isSelected = contains(status.value?default([""]), value)>
+        <#assign isSelected = contains(status.actualValue?default([""]), value)>
         <option value="${value?html}"<#if isSelected> selected="selected"</#if>>${options[value]?html}</option>
         </#list>
     </select>
@@ -289,7 +289,7 @@
     <@bind path/>
     <#list options?keys as value>
     <#assign id="${status.expression}${value_index}">
-    <#assign isSelected = contains(status.value?default([""]), value)>
+    <#assign isSelected = contains(status.actualValue?default([""]), value)>
     <input type="checkbox" id="${id}" name="${status.expression}" value="${value?html}"<#if isSelected> checked="checked"</#if> ${attributes}<@closeTag/>
     <label for="${id}">${options[value]?html}</label>${separator}
     </#list>