From: Henrik Paul <henrik@vaadin.com>
Date: Fri, 6 Dec 2013 23:56:10 +0000 (+0200)
Subject: Fixes a cache range error (#12645)
X-Git-Tag: 7.2.0.beta1~108^2~31
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=78ae8b87003c65eff28c97eef4ab46bdc7aef2f5;p=vaadin-framework.git

Fixes a cache range error (#12645)

Change-Id: I1b1a76978ae39ce93aadcf4859d9eb1d55605694
---

diff --git a/client/src/com/vaadin/client/data/AbstractRemoteDataSource.java b/client/src/com/vaadin/client/data/AbstractRemoteDataSource.java
index bda923ef6f..ff8847ea44 100644
--- a/client/src/com/vaadin/client/data/AbstractRemoteDataSource.java
+++ b/client/src/com/vaadin/client/data/AbstractRemoteDataSource.java
@@ -210,7 +210,16 @@ public abstract class AbstractRemoteDataSource<T> implements DataSource<T> {
                 cached = newUsefulData;
             } else {
                 discardStaleCacheEntries();
-                cached = cached.combineWith(newUsefulData);
+
+                /*
+                 * everything might've become stale so we need to re-check for
+                 * emptiness.
+                 */
+                if (!cached.isEmpty()) {
+                    cached = cached.combineWith(newUsefulData);
+                } else {
+                    cached = newUsefulData;
+                }
             }
         }