From 5ba6f99f8985b27fc466d6c1f6ad75d6ce896a3c Mon Sep 17 00:00:00 2001
From: Artur Signell <artur.signell@itmill.com>
Date: Mon, 20 Dec 2010 14:06:11 +0000
Subject: #6174 JS Error when extending range with multi selection enabled
 table with nullselectallowed=false

svn changeset:16580/svn branch:6.5
---
 src/com/vaadin/ui/Table.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/com/vaadin/ui')

diff --git a/src/com/vaadin/ui/Table.java b/src/com/vaadin/ui/Table.java
index 0ef91acea8..78d7af7393 100644
--- a/src/com/vaadin/ui/Table.java
+++ b/src/com/vaadin/ui/Table.java
@@ -1940,12 +1940,6 @@ public class Table extends AbstractSelect implements Action.Container,
             }
         }
 
-        if (!isNullSelectionAllowed() && newValue.size() < 1) {
-            // empty selection not allowed, keep old value
-            requestRepaint();
-            return;
-        }
-
         /* Add range items aka shift clicked multiselection areas */
         if (ranges != null) {
             for (String range : ranges) {
@@ -1956,6 +1950,12 @@ public class Table extends AbstractSelect implements Action.Container,
             }
         }
 
+        if (!isNullSelectionAllowed() && newValue.size() < 1) {
+            // empty selection not allowed, keep old value
+            requestRepaint();
+            return;
+        }
+
         setValue(newValue, true);
 
     }
-- 
cgit v1.2.3