diff options
author | Mehdi Javan <32511762+mehdi-vaadin@users.noreply.github.com> | 2018-09-17 16:17:28 +0300 |
---|---|---|
committer | Sun Zhe <31067185+ZheSun88@users.noreply.github.com> | 2018-09-17 16:17:28 +0300 |
commit | 663f12b7f6b6da213ce94c48aef1e789669eb22a (patch) | |
tree | b4c7ce8685490a8086780495f24f109cc38a1080 /client | |
parent | 7ac738ed8557bd4157224ba1cafc2b0e634246d6 (diff) | |
download | vaadin-framework-663f12b7f6b6da213ce94c48aef1e789669eb22a.tar.gz vaadin-framework-663f12b7f6b6da213ce94c48aef1e789669eb22a.zip |
Fixing RadioButtonGroup exception in Window (#11181)
* discardStaleCacheEntries is moved to a proper place before updating indexToRowMap and keyToIndexMap maps. In its previous place, it cleared the data that was just put in the maps.
Fixes #11143
* Adding test
* Removing extra annotations
* Updating chrome version to 69 in tests (#11182)
* Updating Chrome version to 69
* Updating screenshots taken in Chrome 69
* Fixing screenshots
* Fixing screenshots
* Adding some wait commands to tests
* Fixing screenshots
* Revert: Fixing screenshots
* More screenshots
* - Adding wait commands to make sure the transitions end before screenshot
- Fixing a screenshot
* Correcting a mistake of using wait instead of sleep
* Fixing more screenshots
* Increasing the height of ContextMenu (Because of limitation of new Chrome 69 in terms of minimum window height, ContextMenu size can't be tested with a small height.)
Diffstat (limited to 'client')
-rw-r--r-- | client/src/main/java/com/vaadin/client/data/AbstractRemoteDataSource.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/client/src/main/java/com/vaadin/client/data/AbstractRemoteDataSource.java b/client/src/main/java/com/vaadin/client/data/AbstractRemoteDataSource.java index 139612517e..7a52b0ef95 100644 --- a/client/src/main/java/com/vaadin/client/data/AbstractRemoteDataSource.java +++ b/client/src/main/java/com/vaadin/client/data/AbstractRemoteDataSource.java @@ -496,6 +496,9 @@ public abstract class AbstractRemoteDataSource<T> implements DataSource<T> { Range newUsefulData = partition[1]; if (!newUsefulData.isEmpty()) { + if (!cached.isEmpty()) + discardStaleCacheEntries(); + // Update the parts that are actually inside int start = newUsefulData.getStart(); for (int i = start; i < newUsefulData.getEnd(); i++) { @@ -515,7 +518,6 @@ public abstract class AbstractRemoteDataSource<T> implements DataSource<T> { if (cached.isEmpty()) { cached = newUsefulData; } else { - discardStaleCacheEntries(); /* * everything might've become stale so we need to re-check for |