Browse Source

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 04eeee3d55)
tags/7.7.0.beta1^0
Dillion Bowman 7 years ago
parent
commit
b2ee7ba254
1 changed files with 2 additions and 1 deletions
  1. 2
    1
      client/src/main/java/com/vaadin/client/widgets/Grid.java

+ 2
- 1
client/src/main/java/com/vaadin/client/widgets/Grid.java View File

*/ */
private void setCellFocus(int rowIndex, int columnIndexDOM, private void setCellFocus(int rowIndex, int columnIndexDOM,
RowContainer container) { RowContainer container) {
if (rowIndex == rowWithFocus
if (container == null
|| rowIndex == rowWithFocus
&& cellFocusRange.contains(columnIndexDOM) && cellFocusRange.contains(columnIndexDOM)
&& container == this.containerWithFocus) { && container == this.containerWithFocus) {
return; return;

Loading…
Cancel
Save