summaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
authorLeif Åstrand <leif@vaadin.com>2013-01-11 16:54:23 +0000
committerVaadin Code Review <review@vaadin.com>2013-01-11 16:54:23 +0000
commit060932a923a37a49b79f3b8fbd3fecccb465f0b3 (patch)
tree010e5ccc3c7fb7b18919320515a715d45f7b13a5 /client
parent541ddc0d97b018bff7a0277c6dd3fcc1c254fc37 (diff)
parent5b81a29acc9909d45c2299541228992aeb19813c (diff)
downloadvaadin-framework-060932a923a37a49b79f3b8fbd3fecccb465f0b3.tar.gz
vaadin-framework-060932a923a37a49b79f3b8fbd3fecccb465f0b3.zip
Merge "Merge of (#8519) to Vaadin 7."
Diffstat (limited to 'client')
-rw-r--r--client/src/com/vaadin/client/ui/VScrollTable.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/client/src/com/vaadin/client/ui/VScrollTable.java b/client/src/com/vaadin/client/ui/VScrollTable.java
index a8cee55375..f14c86aa36 100644
--- a/client/src/com/vaadin/client/ui/VScrollTable.java
+++ b/client/src/com/vaadin/client/ui/VScrollTable.java
@@ -325,8 +325,10 @@ public class VScrollTable extends FlowPanel implements HasWidgets,
// create range of second part unless its length is < 1
VScrollTableRow startOfRange = scrollBody
.getRowByRowIndex(startOfSecondRange);
- ranges.add(new SelectionRange(startOfRange, getEndIndex()
- - startOfSecondRange + 1));
+ if (startOfRange != null) {
+ ranges.add(new SelectionRange(startOfRange, getEndIndex()
+ - startOfSecondRange + 1));
+ }
}
return ranges;
}