aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatti Tahvonen <matti.tahvonen@itmill.com>2009-08-31 11:06:53 +0000
committerMatti Tahvonen <matti.tahvonen@itmill.com>2009-08-31 11:06:53 +0000
commit5301d336458a132ab2710582a74d17a7dfd8e425 (patch)
treef5e2211d930caed0eb1b52c3e1119a4a7baf46f6
parent44b9fb04eff90c1dbcad4f48be0b9c6f0eebfc72 (diff)
downloadvaadin-framework-5301d336458a132ab2710582a74d17a7dfd8e425.tar.gz
vaadin-framework-5301d336458a132ab2710582a74d17a7dfd8e425.zip
fixes #3244, null check for non existing variable
svn changeset:8597/svn branch:6.1
-rw-r--r--src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
index 32808e36c6..ead68311ed 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
@@ -196,8 +196,10 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler {
recalcWidths = uidl.hasAttribute("recalcWidths");
- pageLength = uidl.getIntAttribute("pagelength");
- if (pageLength == 0) {
+ if (uidl.hasAttribute("pagelength")) {
+ pageLength = uidl.getIntAttribute("pagelength");
+ } else {
+ // pagelenght is "0" meaning scrolling is turned off
pageLength = totalRows;
}
firstvisible = uidl.hasVariable("firstvisible") ? uidl