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 AA1C11821F for ; Mon, 1 Jun 2015 14:33:03 +0000 (UTC) Received: (qmail 24944 invoked by uid 500); 1 Jun 2015 14:33:03 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 24908 invoked by uid 500); 1 Jun 2015 14:33:03 -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 24899 invoked by uid 99); 1 Jun 2015 14:33:03 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Jun 2015 14:33:03 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 0EF79CA692 for ; Mon, 1 Jun 2015 14:33:03 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.771 X-Spam-Level: * X-Spam-Status: No, score=1.771 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, 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 (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id tZ-BeN3emAYV for ; Mon, 1 Jun 2015 14:32:58 +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 A4FED47C21 for ; Mon, 1 Jun 2015 14:32:49 +0000 (UTC) Received: (qmail 24207 invoked by uid 99); 1 Jun 2015 14:32:48 -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; Mon, 01 Jun 2015 14:32:48 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id AC266E0525; Mon, 1 Jun 2015 14:32:48 +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: Mon, 01 Jun 2015 14:33:09 -0000 Message-Id: <418df5151b8c49e381de4fd372c537b0@git.apache.org> In-Reply-To: <3a9e6eb848ce42ed88f3ac501c2637c4@git.apache.org> References: <3a9e6eb848ce42ed88f3ac501c2637c4@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [22/50] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-709_2' into ignite-943 Merge remote-tracking branch 'remotes/origin/ignite-709_2' into ignite-943 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3dea5f14 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3dea5f14 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3dea5f14 Branch: refs/heads/ignite-876-2 Commit: 3dea5f148e3fc017bf9643e69f2661a132cfc96c Parents: 110573b 581f4d9 Author: sevdokimov Authored: Thu May 28 17:19:27 2015 +0300 Committer: sevdokimov Committed: Thu May 28 17:19:27 2015 +0300 ---------------------------------------------------------------------- .../configuration/CacheConfiguration.java | 1 - .../processors/cache/GridCacheAdapter.java | 15 ++++++++- .../cache/GridCacheConcurrentMap.java | 21 ++++++++++--- .../processors/cache/GridCacheProcessor.java | 32 +++++++++++--------- .../processors/cache/GridCacheProxyImpl.java | 12 ++++++++ .../processors/cache/IgniteInternalCache.java | 5 +++ .../cache/query/GridCacheQueryAdapter.java | 2 ++ .../cache/query/GridCacheQueryErrorFuture.java | 2 ++ .../cache/query/GridCacheQueryManager.java | 2 +- .../continuous/CacheContinuousQueryManager.java | 24 ++++++++++++--- .../cacheobject/IgniteCacheObjectProcessor.java | 5 ++- .../IgniteCacheObjectProcessorImpl.java | 2 +- 12 files changed, 93 insertions(+), 30 deletions(-) ----------------------------------------------------------------------