Merge "Avoid NPEs in integration test"

2 files changed, 2 insertions, 2 deletions

diff --git a/uitest/src/com/vaadin/tests/integration/IntegrationTestApplication.java b/uitest/src/com/vaadin/tests/integration/IntegrationTestApplication.java
index 41b7b020f5..916af7129e 100644
--- a/uitest/src/com/vaadin/tests/integration/IntegrationTestApplication.java
+++ b/uitest/src/com/vaadin/tests/integration/IntegrationTestApplication.java
@@ -38,7 +38,7 @@ public class IntegrationTestApplication extends LegacyApplication {
         table.addListener(new ValueChangeListener() {
             @Override
             public void valueChange(ValueChangeEvent event) {
-                selectedLabel.setValue(table.getValue().toString());
+                selectedLabel.setValue(String.valueOf(table.getValue()));
             }
         });
         window.addComponent(selectedLabel);
diff --git a/uitest/src/com/vaadin/tests/integration/IntegrationTestUI.java b/uitest/src/com/vaadin/tests/integration/IntegrationTestUI.java
index 05683e7b4e..61214ede8c 100755
--- a/uitest/src/com/vaadin/tests/integration/IntegrationTestUI.java
+++ b/uitest/src/com/vaadin/tests/integration/IntegrationTestUI.java
@@ -34,7 +34,7 @@ public class IntegrationTestUI extends UI {
         table.addValueChangeListener(new ValueChangeListener() {
             @Override
             public void valueChange(ValueChangeEvent event) {
-                selectedLabel.setValue(table.getValue().toString());
+                selectedLabel.setValue(String.valueOf(table.getValue()));
             }
         });
         addComponent(selectedLabel);