Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id F3B58185EE for ; Tue, 22 Dec 2015 15:57:51 +0000 (UTC) Received: (qmail 28171 invoked by uid 500); 22 Dec 2015 15:57:51 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 28124 invoked by uid 500); 22 Dec 2015 15:57:51 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 27875 invoked by uid 99); 22 Dec 2015 15:57:51 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 Dec 2015 15:57:51 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 95381E0AC0; Tue, 22 Dec 2015 15:57:51 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ntikhonov@apache.org To: commits@ignite.apache.org Date: Tue, 22 Dec 2015 15:57:59 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [09/10] ignite git commit: IGNITE-GG-10837 WIP IGNITE-GG-10837 WIP Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d01589ce Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d01589ce Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d01589ce Branch: refs/heads/ignite-gg-10837 Commit: d01589ce4d73e15f8b8e7a5affb7b23d0f49fd52 Parents: f00030d Author: nikolay_tikhonov Authored: Tue Dec 22 17:30:08 2015 +0300 Committer: nikolay_tikhonov Committed: Tue Dec 22 17:30:08 2015 +0300 ---------------------------------------------------------------------- .../distributed/dht/atomic/GridNearAtomicUpdateFuture.java | 2 -- .../ignite/internal/processors/cache/dr/GridCacheDrInfo.java | 8 ++++---- 2 files changed, 4 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/d01589ce/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java index 4745ab1..8692f84 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java @@ -46,9 +46,7 @@ import org.apache.ignite.internal.processors.cache.GridCacheTryPutFailedExceptio import org.apache.ignite.internal.processors.cache.KeyCacheObject; import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTopologyFuture; import org.apache.ignite.internal.processors.cache.distributed.near.GridNearAtomicCache; -import org.apache.ignite.internal.processors.cache.dr.GridCacheDrExpirationInfo; import org.apache.ignite.internal.processors.cache.dr.GridCacheDrInfo; -import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx; import org.apache.ignite.internal.processors.cache.version.GridCacheVersion; import org.apache.ignite.internal.util.future.GridFutureAdapter; import org.apache.ignite.internal.util.tostring.GridToStringInclude; http://git-wip-us.apache.org/repos/asf/ignite/blob/d01589ce/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/dr/GridCacheDrInfo.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/dr/GridCacheDrInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/dr/GridCacheDrInfo.java index 1ec45e1..8dfe313 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/dr/GridCacheDrInfo.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/dr/GridCacheDrInfo.java @@ -21,7 +21,7 @@ import java.io.Externalizable; import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; -import javax.cache.processor.EntryProcessor; +import org.apache.ignite.cache.CacheEntryProcessor; import org.apache.ignite.internal.processors.cache.CacheObject; import org.apache.ignite.internal.processors.cache.version.GridCacheVersion; import org.apache.ignite.internal.util.typedef.internal.CU; @@ -38,7 +38,7 @@ public class GridCacheDrInfo implements Externalizable { private CacheObject val; /** Entry processor. */ - private EntryProcessor proc; + private CacheEntryProcessor proc; /** DR version. */ private GridCacheVersion ver; @@ -70,7 +70,7 @@ public class GridCacheDrInfo implements Externalizable { * @param proc Entry processor. * @param ver Version. */ - public GridCacheDrInfo(EntryProcessor proc, GridCacheVersion ver) { + public GridCacheDrInfo(CacheEntryProcessor proc, GridCacheVersion ver) { assert proc != null; assert ver != null; @@ -88,7 +88,7 @@ public class GridCacheDrInfo implements Externalizable { /** * @return Entry processor. */ - public EntryProcessor entryProcessor() { + public CacheEntryProcessor entryProcessor() { return proc; }