From 59da0ced40a8405d70b7eef0b4efa40433dcce1e Mon Sep 17 00:00:00 2001
From: EdShangGG <eshangareev@gridgain.com>
Date: Mon, 12 Dec 2016 18:55:24 +0300
Subject: [PATCH] GG-11766 Fixing issues after merging db-x and ea7 branch to
 backup-idx branch

---
 .../processors/cache/IgniteCacheOffheapManagerImpl.java      | 5 +----
 .../cache/distributed/dht/GridClientPartitionTopology.java   | 4 ++--
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
index dc985238bd357..2fc568fb26e95 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
+++ b/modules/core/src/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/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridClientPartitionTopology.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridClientPartitionTopology.java
index fb63414fd0d6f..f3b488b0524d4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridClientPartitionTopology.java
+++ b/modules/core/src/main/java/org/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());
                 }