Fixes replaceWithSelect method. Broken since [5390]. Fixes FeaturesApplication (DateF...

svn changeset:6127/svn branch:trunk

diff --git a/src/com/itmill/toolkit/ui/Form.java b/src/com/itmill/toolkit/ui/Form.java
index 55f0655d15206f3e5e5af31ff9c262bd8bb08eec..ecc8ec98cc0ff02597a79d6a295d725e647bb90b 100644 (file)
--- a/src/com/itmill/toolkit/ui/Form.java
+++ b/src/com/itmill/toolkit/ui/Form.java
@@ -746,7 +746,9 @@ public class Form extends AbstractField implements Item.Editor, Buffered, Item,
             throw new IllegalArgumentException("Field with given propertyid '"
                     + propertyId.toString() + "' can not be found.");
         }
-        final Object value = oldField.getValue();
+        final Object value = oldField.getPropertyDataSource() == null ? oldField
+                .getValue()
+                : oldField.getPropertyDataSource().getValue();
 
         // Checks that the value exists and check if the select should
         // be forced in multiselect mode