GG-11766 Fixing issues after merging db-x and ea7 branch to backup-id…

…x branch
apache · Dec 12, 2016 · 59da0ce · 59da0ce
1 parent 47e0116
commit 59da0ce
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/.../main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java b/.../main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
@@ -891,11 +891,8 @@ public CacheDataStoreImpl(
                     rowStore.removeRow(old.link());
                 }
 
-                if (pendingEntries != null && expireTime != 0) {
+                if (pendingEntries != null && expireTime != 0)
                     pendingEntries.put(new PendingRow(expireTime, dataRow.link()));
-
-                    cctx.ttl().onPendingEntryAdded(expireTime);
-                }
             }
             finally {
                 busyLock.leaveBusy();

diff --git a/.../apache/ignite/internal/processors/cache/distributed/dht/GridClientPartitionTopology.java b/.../apache/ignite/internal/processors/cache/distributed/dht/GridClientPartitionTopology.java
@@ -935,9 +935,9 @@ else if (owners.contains(e.getKey()))
 
         try {
             if (skipZeros) {
-                Map<Integer, Long> res = U.newHashMap(cntrMap.size());
+                Map<Integer, T2<Long, Long>> res = U.newHashMap(cntrMap.size());
 
-                for (Map.Entry<Integer, Long> e : cntrMap.entrySet()) {
+                for (Map.Entry<Integer, T2<Long, Long>> e : cntrMap.entrySet()) {
                     if (!e.getValue().equals(ZERO))
                         res.put(e.getKey(), e.getValue());
                 }