From faf3766f7df9a3749a9d88991a77f43bae3efd87 Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Tue, 23 Oct 2012 15:31:56 +0300 Subject: Avoid NPE if a child cannot be found (#10039) Change-Id: I756b5d8a66b89eedb335c23b1ae9610bdb80b2d0 --- client/src/com/vaadin/client/ComponentLocator.java | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'client/src') 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; + } + } } -- cgit v1.2.3