summaryrefslogtreecommitdiffstats
path: root/client/src
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2012-10-23 15:31:56 +0300
committerArtur Signell <artur@vaadin.com>2012-10-23 15:32:52 +0300
commitfaf3766f7df9a3749a9d88991a77f43bae3efd87 (patch)
tree3ba78c16ed9a180e1fc73119ddcaa4dfc34aa12b /client/src
parent8bd29966986e77978609feee36e86574c5ecb6d1 (diff)
downloadvaadin-framework-faf3766f7df9a3749a9d88991a77f43bae3efd87.tar.gz
vaadin-framework-faf3766f7df9a3749a9d88991a77f43bae3efd87.zip
Avoid NPE if a child cannot be found (#10039)
Change-Id: I756b5d8a66b89eedb335c23b1ae9610bdb80b2d0
Diffstat (limited to 'client/src')
-rw-r--r--client/src/com/vaadin/client/ComponentLocator.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/client/src/com/vaadin/client/ComponentLocator.java b/client/src/com/vaadin/client/ComponentLocator.java
index e69c55d445..47fb29777c 100644
--- a/client/src/com/vaadin/client/ComponentLocator.java
+++ b/client/src/com/vaadin/client/ComponentLocator.java
@@ -332,6 +332,11 @@ public class ComponentLocator {
} catch (Exception e) {
return null;
}
+
+ if (element == null) {
+ return null;
+ }
+
}
}