#ignite-738: Fix GridApiSecurityAbstractSelfTest.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0cdd6057 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0cdd6057 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0cdd6057 Branch: refs/heads/ignite-485 Commit: 0cdd605763c6e17b6989c93045eacf07d20f4148 Parents: 4623cad Author: ivasilinets <ivasilin...@gridgain.com> Authored: Mon Apr 13 16:23:14 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Mon Apr 13 16:23:14 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/internal/processors/cache/IgniteCacheProxy.java | 3 +++ .../apache/ignite/internal/processors/cache/query/CacheQuery.java | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0cdd6057/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java ---------------------------------------------------------------------- diff --git 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 index 44a5dbe..f1c2614 100644 --- 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 @@ -33,6 +33,7 @@ import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.lang.*; import org.apache.ignite.mxbean.*; +import org.apache.ignite.plugin.security.*; import org.apache.ignite.spi.discovery.tcp.internal.*; import org.jetbrains.annotations.*; @@ -451,6 +452,8 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { + ctx.checkSecurity(SecurityPermission.CACHE_READ); + validate(qry); if (qry instanceof ContinuousQuery) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0cdd6057/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQuery.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQuery.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQuery.java index 79772e1..e2bf3fb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQuery.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQuery.java @@ -32,8 +32,7 @@ import org.jetbrains.annotations.*; * <h1 class="header">SQL Queries</h1> * {@code SQL} query allows to execute distributed cache * queries using standard SQL syntax. All values participating in where clauses - * or joins must be annotated with {@link QuerySqlField} annotation. Query can be created - * with {@link CacheQueries#createSqlQuery(Class, String)} method. + * or joins must be annotated with {@link QuerySqlField} annotation. * <h2 class="header">Field Queries</h2> * By default {@code select} clause is ignored as query result contains full objects. * If it is needed to select individual fields, use {@link CacheQueries#createSqlFieldsQuery(String)} method.
