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 35BCC181B9 for ; Wed, 8 Jul 2015 13:20:05 +0000 (UTC) Received: (qmail 88714 invoked by uid 500); 8 Jul 2015 13:20:05 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 88682 invoked by uid 500); 8 Jul 2015 13:20:05 -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 88664 invoked by uid 99); 8 Jul 2015 13:20:05 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 08 Jul 2015 13:20:05 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id A0E5A1A6B39 for ; Wed, 8 Jul 2015 13:19:59 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.791 X-Spam-Level: * X-Spam-Status: No, score=1.791 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id V0OtgicMZrMd for ; Wed, 8 Jul 2015 13:19:44 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id D0E3C4E223 for ; Wed, 8 Jul 2015 13:18:17 +0000 (UTC) Received: (qmail 85614 invoked by uid 99); 8 Jul 2015 13:18:16 -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; Wed, 08 Jul 2015 13:18:16 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BF968E3609; Wed, 8 Jul 2015 13:18:15 +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 Date: Wed, 08 Jul 2015 13:18:35 -0000 Message-Id: In-Reply-To: <878e9e6609994fb0a1ee7fc838eaf6f9@git.apache.org> References: <878e9e6609994fb0a1ee7fc838eaf6f9@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [21/50] incubator-ignite git commit: # minor format # minor format Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f2aa6ab5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f2aa6ab5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f2aa6ab5 Branch: refs/heads/ignite-648-failover Commit: f2aa6ab5a5e049e10bfec06142b3f734d0709996 Parents: b87f138 Author: Yakov Zhdanov Authored: Tue Jul 7 10:35:03 2015 +0300 Committer: Yakov Zhdanov Committed: Tue Jul 7 10:35:03 2015 +0300 ---------------------------------------------------------------------- .../internal/processors/cache/CacheObjectImpl.java | 1 - .../distributed/dht/GridPartitionedGetFuture.java | 13 ++++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2aa6ab5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectImpl.java index ad033a7..96603f9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectImpl.java @@ -77,7 +77,6 @@ public class CacheObjectImpl extends CacheObjectAdapter { catch (IgniteCheckedException e) { throw new IgniteException("Failed to unmarshall object.", e); } - } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2aa6ab5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java index 2f41e63..79d5e75 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java @@ -224,7 +224,7 @@ public class GridPartitionedGetFuture extends GridCompoundIdentityFuture> fut : futures()) + for (IgniteInternalFuture> fut : futures()) { if (isMini(fut)) { MiniFuture f = (MiniFuture)fut; @@ -234,6 +234,7 @@ public class GridPartitionedGetFuture extends GridCompoundIdentityFuture extends GridCompoundIdentityFuture