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 50434177A2 for ; Fri, 17 Apr 2015 14:36:33 +0000 (UTC) Received: (qmail 20030 invoked by uid 500); 17 Apr 2015 14:36:33 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 19995 invoked by uid 500); 17 Apr 2015 14:36:33 -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 19980 invoked by uid 99); 17 Apr 2015 14:36:33 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 17 Apr 2015 14:36:33 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Fri, 17 Apr 2015 14:36:11 +0000 Received: (qmail 16276 invoked by uid 99); 17 Apr 2015 14:36:06 -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, 17 Apr 2015 14:36:06 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BB2A9E054C; Fri, 17 Apr 2015 14:36:06 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: akuznetsov@apache.org To: commits@ignite.incubator.apache.org Date: Fri, 17 Apr 2015 14:36:53 -0000 Message-Id: <0b2fd14927aa4697804a086aea8756f8@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [49/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-743' into ignite-sprint-4 X-Virus-Checked: Checked by ClamAV on apache.org Merge remote-tracking branch 'remotes/origin/ignite-743' into ignite-sprint-4 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/357a7156 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/357a7156 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/357a7156 Branch: refs/heads/ignite-755 Commit: 357a7156baf2f78b070545e4d9be5500ec01cf65 Parents: 122f3ce 23a41df Author: ivasilinets Authored: Fri Apr 17 13:59:35 2015 +0300 Committer: ivasilinets Committed: Fri Apr 17 13:59:35 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheGateway.java | 111 ++++-- .../processors/cache/IgniteCacheProxy.java | 353 +++++++++++-------- .../datastreamer/DataStreamerCacheUpdaters.java | 2 +- .../datastreamer/DataStreamerImpl.java | 81 ++--- .../datastreamer/DataStreamerUpdateJob.java | 16 +- .../dr/IgniteDrDataStreamerCacheUpdater.java | 2 - 6 files changed, 320 insertions(+), 245 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/357a7156/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java index b890407,c1a2d6a..244e200 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java @@@ -449,11 -485,9 +486,11 @@@ public class IgniteCacheProxy ext @Override public QueryCursor query(Query qry) { A.notNull(qry, "qry"); - GridCacheProjectionImpl prev = gate.enter(prj); + GridCacheProjectionImpl prev = onEnter(prj); try { + ctx.checkSecurity(SecurityPermission.CACHE_READ); + validate(qry); if (qry instanceof ContinuousQuery) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/357a7156/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerCacheUpdaters.java ----------------------------------------------------------------------