summaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorTeemu Suo-Anttila <teemusa@vaadin.com>2014-07-09 14:33:21 +0300
committerLeif Åstrand <leif@vaadin.com>2014-07-09 11:43:57 +0000
commitfa59f5746cfb41d88da573007acddeb1bb960071 (patch)
treead76b447258269579d21b4f3ced64d72ac2464fc /server
parentd47cade845ecdaee28e2c7963452fe518511f62f (diff)
downloadvaadin-framework-fa59f5746cfb41d88da573007acddeb1bb960071.tar.gz
vaadin-framework-fa59f5746cfb41d88da573007acddeb1bb960071.zip
Fix unpinning in DataProviderKeyMapper (#13334)
Change-Id: I485f262a4e44de10f207c804b91efe2f7ccf7670
Diffstat (limited to 'server')
-rw-r--r--server/src/com/vaadin/data/RpcDataProviderExtension.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/server/src/com/vaadin/data/RpcDataProviderExtension.java b/server/src/com/vaadin/data/RpcDataProviderExtension.java
index e6b5050d90..801b925e2a 100644
--- a/server/src/com/vaadin/data/RpcDataProviderExtension.java
+++ b/server/src/com/vaadin/data/RpcDataProviderExtension.java
@@ -277,10 +277,10 @@ public class RpcDataProviderExtension extends AbstractExtension {
}
pinnedItemIds.remove(itemId);
- final Integer removedIndex = indexToItemId.inverse().remove(itemId);
- if (removedIndex == null
- || !activeRange.contains(removedIndex.intValue())) {
+ final Integer index = indexToItemId.inverse().get(itemId);
+ if (index == null || !activeRange.contains(index.intValue())) {
itemIdToKey.remove(itemId);
+ indexToItemId.remove(index);
}
}