summaryrefslogtreecommitdiffstats
path: root/client/src
diff options
context:
space:
mode:
authorelmot <elmot@vaadin.com>2016-09-29 18:52:35 +0300
committerelmot <elmot@vaadin.com>2016-09-30 08:02:54 +0300
commitdb3a91c9b4d8d0451c8f1c5e875f4c6f6f50324a (patch)
tree27a2193cbae9dc25869cf2240eeaa9ffd3d5e8af /client/src
parent2bee988272657df4d886ea79b04be9fbc54d3928 (diff)
downloadvaadin-framework-db3a91c9b4d8d0451c8f1c5e875f4c6f6f50324a.tar.gz
vaadin-framework-db3a91c9b4d8d0451c8f1c5e875f4c6f6f50324a.zip
Fix RadioButtonGroup client-side NPE which breaks item icons.
Change-Id: I3a9c887196b503eaa8c2307d7a714ce61e6deacc
Diffstat (limited to 'client/src')
-rw-r--r--client/src/main/java/com/vaadin/client/ui/VRadioButtonGroup.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/client/src/main/java/com/vaadin/client/ui/VRadioButtonGroup.java b/client/src/main/java/com/vaadin/client/ui/VRadioButtonGroup.java
index bb81b2872e..fd4d7cf98a 100644
--- a/client/src/main/java/com/vaadin/client/ui/VRadioButtonGroup.java
+++ b/client/src/main/java/com/vaadin/client/ui/VRadioButtonGroup.java
@@ -229,7 +229,8 @@ public class VRadioButtonGroup extends Composite implements Field, ClickHandler,
public void selectItemKey(String selectedItemKey) {
RadioButton radioButton = keyToOptions.get(selectedItemKey);
- assert radioButton != null;
- radioButton.setValue(true);
+ if(radioButton!=null) {//Items might not be loaded yet
+ radioButton.setValue(true);
+ }
}
}