From b2ee7ba2544aadbfc450efffdb9f0121c6bca7ce Mon Sep 17 00:00:00 2001 From: Dillion Bowman Date: Thu, 14 Jul 2016 09:11:17 -0400 Subject: Added a null check to method 'setCellFocus' in grid.java in line with other checks that shortcircuit method(#20031) Change-Id: I55e240980377d7ad94c06e2bf395acd95de32542 (cherry picked from commit 04eeee3d55b253435fdb7c8e5f23ebb970099022) --- client/src/main/java/com/vaadin/client/widgets/Grid.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/client/src/main/java/com/vaadin/client/widgets/Grid.java b/client/src/main/java/com/vaadin/client/widgets/Grid.java index 7665111416..de0706a8d2 100644 --- a/client/src/main/java/com/vaadin/client/widgets/Grid.java +++ b/client/src/main/java/com/vaadin/client/widgets/Grid.java @@ -2526,7 +2526,8 @@ public class Grid extends ResizeComposite implements */ private void setCellFocus(int rowIndex, int columnIndexDOM, RowContainer container) { - if (rowIndex == rowWithFocus + if (container == null + || rowIndex == rowWithFocus && cellFocusRange.contains(columnIndexDOM) && container == this.containerWithFocus) { return; -- cgit v1.2.3