From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Mon, 31 Aug 2009 11:06:53 +0000 (+0000)
Subject: fixes #3244, null check for non existing variable
X-Git-Tag: 6.7.0.beta1~2563
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=5301d336458a132ab2710582a74d17a7dfd8e425;p=vaadin-framework.git

fixes #3244, null check for non existing variable

svn changeset:8597/svn branch:6.1
---

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