From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Fri, 13 Jul 2007 06:49:24 +0000 (+0000)
Subject: null check
X-Git-Tag: 6.7.0.beta1~6177
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=99b84bc0867400460b30a8cdd9f5525ff4ac4063;p=vaadin-framework.git

null check

svn changeset:1851/svn branch:trunk
---

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITablePaging.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/ITablePaging.java
index 9272bed6f1..b76026010e 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITablePaging.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/ITablePaging.java
@@ -95,16 +95,18 @@ public class ITablePaging extends Composite implements ITable, Paintable, ClickL
 		this.firstRow = uidl.getIntAttribute("firstrow");
 		this.rows = uidl.getIntAttribute("rows");
 		
-		Set selectedKeys = uidl.getStringArrayVariableAsSet("selected");
-		selectedRowKeys.clear();
-		for(Iterator it = selectedKeys.iterator();it.hasNext();)
-			selectedRowKeys.add((String) it.next());
-		
 		if(uidl.hasAttribute("selectmode")) {
 			if(uidl.getStringAttribute("selectmode").equals("multi"))
 				selectMode = ITable.SELECT_MODE_MULTI;
 			else
 				selectMode = ITable.SELECT_MODE_SINGLE;
+			
+			if(uidl.hasAttribute("selected")) {
+				Set selectedKeys = uidl.getStringArrayVariableAsSet("selected");
+				selectedRowKeys.clear();
+				for(Iterator it = selectedKeys.iterator();it.hasNext();)
+					selectedRowKeys.add((String) it.next());
+			}
 		}
 		
 		if(uidl.hasVariable("sortascending"))