Merge remote-tracking branch 'origin/6.8'

Conflicts:
	server/src/com/vaadin/ui/Select.java

1 files changed, 1 insertions, 13 deletions

diff --git a/server/src/com/vaadin/ui/Select.java b/server/src/com/vaadin/ui/Select.java
index 20345b55e0..6ff7c9c9bc 100644
--- a/server/src/com/vaadin/ui/Select.java
+++ b/server/src/com/vaadin/ui/Select.java
@@ -654,7 +654,7 @@ public class Select extends AbstractSelect implements AbstractSelect.Filtering,
             if (filterstring != null) {
                 filterstring = filterstring.toLowerCase();
             }
-            optionRepaint();
+            requestRepaint();
         } else if (isNewItemsAllowed()) {
             // New option entered (and it is allowed)
             final String newitem = (String) variables.get("newitem");
@@ -682,18 +682,6 @@ public class Select extends AbstractSelect implements AbstractSelect.Filtering,
     }
 
     @Override
-    public void markAsDirty() {
-        super.markAsDirty();
-        optionRequest = false;
-        prevfilterstring = filterstring;
-        filterstring = null;
-    }
-
-    private void optionRepaint() {
-        super.markAsDirty();
-    }
-
-    @Override
     public void setFilteringMode(int filteringMode) {
         this.filteringMode = filteringMode;
     }