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-648 Commit: 357a7156baf2f78b070545e4d9be5500ec01cf65 Parents: 122f3ce 23a41df Author: ivasilinets <ivasilin...@gridgain.com> Authored: Fri Apr 17 13:59:35 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> 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<K, V> ext @Override public <R> QueryCursor<R> query(Query<R> qry) { A.notNull(qry, "qry"); - GridCacheProjectionImpl<K, V> prev = gate.enter(prj); + GridCacheProjectionImpl<K, V> 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 ----------------------------------------------------------------------
