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 128C41771A for ; Fri, 24 Apr 2015 14:05:50 +0000 (UTC) Received: (qmail 94004 invoked by uid 500); 24 Apr 2015 14:05:50 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 93971 invoked by uid 500); 24 Apr 2015 14:05:50 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 93962 invoked by uid 99); 24 Apr 2015 14:05:49 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 Apr 2015 14:05:49 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=5.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: local policy) Received: from [54.191.145.13] (HELO mx1-us-west.apache.org) (54.191.145.13) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 Apr 2015 14:05:44 +0000 Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id 36CE624E9B for ; Fri, 24 Apr 2015 14:05:24 +0000 (UTC) Received: (qmail 93155 invoked by uid 99); 24 Apr 2015 14:05:23 -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; Fri, 24 Apr 2015 14:05:23 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8F0C4E05D3; Fri, 24 Apr 2015 14:05:23 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.incubator.apache.org Message-Id: <9fcc209aeb7749feaf8141c948b3d1a6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: incubator-ignite git commit: ignite-800: fix compilation Date: Fri, 24 Apr 2015 14:05:23 +0000 (UTC) X-Virus-Checked: Checked by ClamAV on apache.org Repository: incubator-ignite Updated Branches: refs/heads/ignite-800 e79636aa2 -> 182db433e ignite-800: fix compilation Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/182db433 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/182db433 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/182db433 Branch: refs/heads/ignite-800 Commit: 182db433e13cc542d0ad27531cbf6fa628a6cf70 Parents: e79636a Author: Artem Shutak Authored: Fri Apr 24 17:05:16 2015 +0300 Committer: Artem Shutak Committed: Fri Apr 24 17:05:16 2015 +0300 ---------------------------------------------------------------------- .../internal/processors/cache/CacheInvokeResult.java | 14 +++++++------- .../distributed/dht/atomic/GridDhtAtomicCache.java | 2 +- .../cache/local/atomic/GridLocalAtomicCache.java | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/182db433/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeResult.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeResult.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeResult.java index f8fdc60..82f5d7c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeResult.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeResult.java @@ -51,11 +51,11 @@ public class CacheInvokeResult implements EntryProcessorResult, Externaliz * @return New instance. */ public static CacheInvokeResult fromResult(T res) { - CacheInvokeResult result = new CacheInvokeResult<>(); + CacheInvokeResult cacheRes = new CacheInvokeResult<>(); - result.res = res; + cacheRes.res = res; - return result; + return cacheRes; } /** @@ -64,12 +64,12 @@ public class CacheInvokeResult implements EntryProcessorResult, Externaliz * @param err Exception thrown by {@link EntryProcessor#process(MutableEntry, Object...)}. * @return New instance. */ - public static CacheInvokeResult fromError(Exception err) { - CacheInvokeResult result = new CacheInvokeResult<>(); + public static CacheInvokeResult fromError(Exception err) { + CacheInvokeResult res = new CacheInvokeResult<>(); - result.err = err; + res.err = err; - return result; + return res; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/182db433/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java index 81ba0e8..f79bb61 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java @@ -600,7 +600,7 @@ public class GridDhtAtomicCache extends GridDhtCacheAdapter { throws IgniteCheckedException { EntryProcessorResult res = invokeAsync(key, entryProcessor, args).get(); - return res != null ? res : new CacheInvokeResult<>(); + return res != null ? res : new CacheInvokeResult(); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/182db433/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java index 1aee791..76fed6f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java @@ -561,7 +561,7 @@ public class GridLocalAtomicCache extends GridCacheAdapter { Object... args) throws IgniteCheckedException { EntryProcessorResult res = invokeAsync(key, entryProcessor, args).get(); - return res != null ? res : new CacheInvokeResult<>(); + return res != null ? res : new CacheInvokeResult(); } /** {@inheritDoc} */