1 files changed, 3 insertions, 1 deletions
diff --git a/server/src/main/java/com/vaadin/data/provider/HierarchicalDataCommunicator.java b/server/src/main/java/com/vaadin/data/provider/HierarchicalDataCommunicator.java
index 5761b65d35..820e3d8f2c 100644
--- a/server/src/main/java/com/vaadin/data/provider/HierarchicalDataCommunicator.java
+++ b/server/src/main/java/com/vaadin/data/provider/HierarchicalDataCommunicator.java
@@ -288,7 +288,9 @@ public class HierarchicalDataCommunicator<T> extends DataCommunicator<T> {
             String itemKey = keys.getString(i);
             if (!mapper.isKeyStored(itemKey)
                     && !rowKeysPendingExpand.contains(itemKey)) {
-                getActiveDataHandler().dropActiveData(itemKey);
+                // FIXME: cache invalidated incorrectly, active keys being
+                // dropped prematurely
+                // getActiveDataHandler().dropActiveData(itemKey);
             }
         }
     }