diff options
| -rw-r--r-- | src/com/itmill/toolkit/ui/Select.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/com/itmill/toolkit/ui/Select.java b/src/com/itmill/toolkit/ui/Select.java index 5b33aadd5c..3c769912ba 100644 --- a/src/com/itmill/toolkit/ui/Select.java +++ b/src/com/itmill/toolkit/ui/Select.java @@ -169,8 +169,14 @@ public class Select extends AbstractSelect implements AbstractSelect.Filtering { while (i.hasNext()) { - // Gets the option attribute values final Object id = i.next(); + + if (!isNullSelectionAllowed() && id != null + && id.equals(getNullSelectionItemId()) && !isSelected(id)) { + continue; + } + + // Gets the option attribute values final String key = itemIdMapper.key(id); final String caption = getItemCaption(id); final Resource icon = getItemIcon(id); |