diff options
| author | Matti Tahvonen <matti.tahvonen@itmill.com> | 2009-10-27 12:35:49 +0000 |
|---|---|---|
| committer | Matti Tahvonen <matti.tahvonen@itmill.com> | 2009-10-27 12:35:49 +0000 |
| commit | a0ce4868b70bad007a1a7dcde09b5eb1ef06b711 (patch) | |
| tree | ff0910bd17424fd0c98cf10cea1683b283fa37f1 /src/com/vaadin/ui | |
| parent | cb2405c9b7c2d914f12d4d2afbd57e66f2960456 (diff) | |
| download | vaadin-framework-a0ce4868b70bad007a1a7dcde09b5eb1ef06b711.tar.gz vaadin-framework-a0ce4868b70bad007a1a7dcde09b5eb1ef06b711.zip | |
merged [9405],[9404] from 6.1
svn changeset:9407/svn branch:6.2
Diffstat (limited to 'src/com/vaadin/ui')
| -rw-r--r-- | src/com/vaadin/ui/AbstractSelect.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/com/vaadin/ui/AbstractSelect.java b/src/com/vaadin/ui/AbstractSelect.java index 7df90c8ca6..767fc21bd2 100644 --- a/src/com/vaadin/ui/AbstractSelect.java +++ b/src/com/vaadin/ui/AbstractSelect.java @@ -590,8 +590,8 @@ public abstract class AbstractSelect extends AbstractField implements @Override public void setValue(Object newValue) throws Property.ReadOnlyException, Property.ConversionException { - if (newValue == null) { - newValue = getNullSelectionItemId(); + if (newValue == getNullSelectionItemId()) { + newValue = null; } setValue(newValue, false); @@ -1311,7 +1311,7 @@ public abstract class AbstractSelect extends AbstractField implements * </p> * * @param itemId - * the tem to be selected. + * the identifier of Item to be selected. * @see #getNullSelectionItemId() * @see #setNullSelectionItemId(Object) * @@ -1331,7 +1331,7 @@ public abstract class AbstractSelect extends AbstractField implements * Unselects an item. * * @param itemId - * the Item to be unselected. + * the identifier of the Item to be unselected. * @see #getNullSelectionItemId() * @see #setNullSelectionItemId(Object) * |