diff options
| author | Dillion Bowman <djbowman@mix.wvu.edu> | 2016-07-14 09:11:17 -0400 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2016-07-15 07:28:02 +0000 |
| commit | b2ee7ba2544aadbfc450efffdb9f0121c6bca7ce (patch) | |
| tree | 529b9db86cafec504aa7ecd98240a6e02350e9f4 | |
| parent | 4318107af7eec14c9a0392de3dd7c95a116c3da7 (diff) | |
| download | vaadin-framework-b2ee7ba2544aadbfc450efffdb9f0121c6bca7ce.tar.gz vaadin-framework-b2ee7ba2544aadbfc450efffdb9f0121c6bca7ce.zip | |
Added a null check to method 'setCellFocus' in grid.java in line with other checks that shortcircuit method(#20031)7.7.0.beta1
Change-Id: I55e240980377d7ad94c06e2bf395acd95de32542
(cherry picked from commit 04eeee3d55b253435fdb7c8e5f23ebb970099022)
| -rw-r--r-- | client/src/main/java/com/vaadin/client/widgets/Grid.java | 3 |
1 files changed, 2 insertions, 1 deletions
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<T> 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; |