#6049 do not re-filter BeanItemContainer if removing non-existing filters

svn changeset:16128/svn branch:6.5

1 files changed, 8 insertions, 4 deletions

diff --git a/src/com/vaadin/data/util/BeanItemContainer.java b/src/com/vaadin/data/util/BeanItemContainer.java
index dcf7f0bf6f..abfb3bc9a9 100644
--- a/src/com/vaadin/data/util/BeanItemContainer.java
+++ b/src/com/vaadin/data/util/BeanItemContainer.java
@@ -786,18 +786,22 @@ public class BeanItemContainer<BT> implements Indexed, Sortable, Filterable,
      */
     public void removeContainerFilters(Object propertyId) {
         if (!filters.isEmpty()) {
+            boolean filteringChanged = false;
             for (Iterator<Filter> iterator = filters.iterator(); iterator
                     .hasNext();) {
                 Filter f = iterator.next();
                 if (f.propertyId.equals(propertyId)) {
                     iterator.remove();
+                    filteringChanged = true;
                 }
             }
-            // stop listening to change events for the property
-            for (BeanItem<BT> item : beanToItem.values()) {
-                removeValueChangeListener(item, propertyId);
+            if (filteringChanged) {
+                // stop listening to change events for the property
+                for (BeanItem<BT> item : beanToItem.values()) {
+                    removeValueChangeListener(item, propertyId);
+                }
+                filterAll();
             }
-            filterAll();
         }
     }