#6174 JS Error when extending range with multi selection enabled table with nullselectallowed=false

svn changeset:16580/svn branch:6.5

1 files changed, 6 insertions, 6 deletions

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);
 
     }