Repository: incubator-ignite Updated Branches: refs/heads/ignite-614 419798bb9 -> a68f19a50
#ignite-614: Remove code for test. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a68f19a5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a68f19a5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a68f19a5 Branch: refs/heads/ignite-614 Commit: a68f19a5029008acc2afdef7def9354b3190ec05 Parents: 419798b Author: ivasilinets <ivasilin...@gridgain.com> Authored: Fri May 15 12:31:21 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Fri May 15 12:31:21 2015 +0300 ---------------------------------------------------------------------- .../GridCacheEntryInfoCollectSwapListener.java | 39 ++++++++++++-------- 1 file changed, 23 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a68f19a5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfoCollectSwapListener.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfoCollectSwapListener.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfoCollectSwapListener.java index 9cf40cb..f48f53a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfoCollectSwapListener.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfoCollectSwapListener.java @@ -84,29 +84,36 @@ public class GridCacheEntryInfoCollectSwapListener implements GridCacheSwapListe KeyCacheObject key, GridCacheSwapEntry swapEntry) { - assert key != null; - assert swapEntry != null; + if (log.isDebugEnabled()) + log.debug("Received unswapped event for key: " + key); - GridCacheEntryInfo info = new GridCacheEntryInfo(); + assert key != null; - info.key(key); - info.ttl(swapEntry.ttl()); - info.expireTime(swapEntry.expireTime()); - info.version(swapEntry.version()); - info.value(swapEntry.value()); + try { + assert swapEntry != null; - swappedEntries.put(key, info); + GridCacheEntryInfo info = new GridCacheEntryInfo(); - swappingKeys.remove(key); + info.key(key); + info.ttl(swapEntry.ttl()); + info.expireTime(swapEntry.expireTime()); + info.version(swapEntry.version()); + info.value(swapEntry.value()); - emptyLock.lock(); - - try{ - if (swappingKeys.size() == 0) - emptyCond.signalAll(); + swappedEntries.put(key, info); } finally { - emptyLock.unlock(); + swappingKeys.remove(key); + + emptyLock.lock(); + + try { + if (swappingKeys.size() == 0) + emptyCond.signalAll(); + } + finally { + emptyLock.unlock(); + } } }
