diff options
Diffstat (limited to 'src/com/vaadin/ui/AbstractSelect.java')
| -rw-r--r-- | src/com/vaadin/ui/AbstractSelect.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/vaadin/ui/AbstractSelect.java b/src/com/vaadin/ui/AbstractSelect.java index 646d898a54..eaac3bb4c5 100644 --- a/src/com/vaadin/ui/AbstractSelect.java +++ b/src/com/vaadin/ui/AbstractSelect.java @@ -1080,7 +1080,10 @@ public abstract class AbstractSelect extends AbstractField implements final Property p = getContainerProperty(itemId, getItemCaptionPropertyId()); if (p != null) { - caption = p.toString(); + Object value = p.getValue(); + if (value != null) { + caption = value.toString(); + } } break; } |