From 44ee20a041cb390e95fff33953a44f2a299d6a47 Mon Sep 17 00:00:00 2001
From: Teemu Pöntelin <teemu@vaadin.com>
Date: Tue, 26 Aug 2014 19:29:35 +0300
Subject: Fixed ComboBox filtering when page length is zero (#14509)

Change-Id: I663b39a37bcdf4383fa76d04acd127503ced11df
---
 server/src/com/vaadin/ui/ComboBox.java | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'server')

diff --git a/server/src/com/vaadin/ui/ComboBox.java b/server/src/com/vaadin/ui/ComboBox.java
index 5367505c56..c2b80fae35 100644
--- a/server/src/com/vaadin/ui/ComboBox.java
+++ b/server/src/com/vaadin/ui/ComboBox.java
@@ -151,6 +151,11 @@ public class ComboBox extends AbstractSelect implements
         markAsDirty();
     }
 
+    private boolean isFilteringNeeded() {
+        return filterstring != null && filterstring.length() > 0
+                && filteringMode != FilteringMode.OFF;
+    }
+
     @Override
     public void paintContent(PaintTarget target) throws PaintException {
         isPainting = true;
@@ -210,9 +215,7 @@ public class ComboBox extends AbstractSelect implements
                 filterstring = "";
             }
 
-            boolean nullFilteredOut = filterstring != null
-                    && !"".equals(filterstring)
-                    && filteringMode != FilteringMode.OFF;
+            boolean nullFilteredOut = isFilteringNeeded();
             // null option is needed and not filtered out, even if not on
             // current
             // page
@@ -351,8 +354,8 @@ public class ComboBox extends AbstractSelect implements
     protected List<?> getOptionsWithFilter(boolean needNullSelectOption) {
         Container container = getContainerDataSource();
 
-        if (pageLength == 0) {
-            // no paging: return all items
+        if (pageLength == 0 && !isFilteringNeeded()) {
+            // no paging or filtering: return all items
             filteredSize = container.size();
             assert filteredSize >= 0;
             return new ArrayList<Object>(container.getItemIds());
@@ -593,8 +596,7 @@ public class ComboBox extends AbstractSelect implements
      * @return
      */
     protected List<?> getFilteredOptions() {
-        if (null == filterstring || "".equals(filterstring)
-                || FilteringMode.OFF == filteringMode) {
+        if (!isFilteringNeeded()) {
             prevfilterstring = null;
             filteredOptions = new LinkedList<Object>(getItemIds());
             return filteredOptions;
-- 
cgit v1.2.3