You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2018/11/28 08:45:39 UTC
[2/2] ignite git commit: Done.
Done.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0379f945
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0379f945
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0379f945
Branch: refs/heads/ignite-10435
Commit: 0379f945cbd5c095d9cfb84ac01f9a0d97334f4f
Parents: 8d2f8ba
Author: devozerov <vo...@gridgain.com>
Authored: Wed Nov 28 11:42:54 2018 +0300
Committer: devozerov <vo...@gridgain.com>
Committed: Wed Nov 28 11:42:54 2018 +0300
----------------------------------------------------------------------
.../platform/client/ClientRequest.java | 19 -------------------
...lientCacheCreateWithConfigurationRequest.java | 7 +++----
...CacheGetOrCreateWithConfigurationRequest.java | 4 +---
3 files changed, 4 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0379f945/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientRequest.java
index 3e4bf06..76823b5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientRequest.java
@@ -19,8 +19,6 @@ package org.apache.ignite.internal.processors.platform.client;
import org.apache.ignite.binary.BinaryRawReader;
import org.apache.ignite.internal.processors.odbc.ClientListenerRequest;
-import org.apache.ignite.plugin.security.SecurityException;
-import org.apache.ignite.plugin.security.SecurityPermission;
/**
* Thin client request.
@@ -60,21 +58,4 @@ public class ClientRequest implements ClientListenerRequest {
public ClientResponse process(ClientConnectionContext ctx) {
return new ClientResponse(reqId);
}
-
- /**
- * Run the code with converting {@link SecurityException} to {@link IgniteClientException}.
- */
- // TODO
- protected static void runWithSecurityExceptionHandler(Runnable runnable) {
- try {
- runnable.run();
- }
- catch (SecurityException ex) {
- throw new IgniteClientException(
- ClientStatus.SECURITY_VIOLATION,
- "Client is not authorized to perform this operation",
- ex
- );
- }
- }
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/0379f945/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheCreateWithConfigurationRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheCreateWithConfigurationRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheCreateWithConfigurationRequest.java
index 3683cfe..93a18ed 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheCreateWithConfigurationRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheCreateWithConfigurationRequest.java
@@ -26,7 +26,6 @@ import org.apache.ignite.internal.processors.platform.client.ClientRequest;
import org.apache.ignite.internal.processors.platform.client.ClientResponse;
import org.apache.ignite.internal.processors.platform.client.ClientStatus;
import org.apache.ignite.internal.processors.platform.client.IgniteClientException;
-import org.apache.ignite.plugin.security.SecurityPermission;
/**
* Cache create with configuration request.
@@ -51,9 +50,9 @@ public class ClientCacheCreateWithConfigurationRequest extends ClientRequest {
/** {@inheritDoc} */
@Override public ClientResponse process(ClientConnectionContext ctx) {
try {
- // Use security exception handler since the code authorizes "enable on-heap cache" permission
- runWithSecurityExceptionHandler(() -> ctx.kernalContext().grid().createCache(cacheCfg));
- } catch (CacheExistsException e) {
+ ctx.kernalContext().grid().createCache(cacheCfg);
+ }
+ catch (CacheExistsException e) {
throw new IgniteClientException(ClientStatus.CACHE_EXISTS, e.getMessage());
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/0379f945/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheGetOrCreateWithConfigurationRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheGetOrCreateWithConfigurationRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheGetOrCreateWithConfigurationRequest.java
index 6d39eeb..77368be 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheGetOrCreateWithConfigurationRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheGetOrCreateWithConfigurationRequest.java
@@ -26,7 +26,6 @@ import org.apache.ignite.internal.processors.platform.client.ClientRequest;
import org.apache.ignite.internal.processors.platform.client.ClientResponse;
import org.apache.ignite.internal.processors.platform.client.ClientStatus;
import org.apache.ignite.internal.processors.platform.client.IgniteClientException;
-import org.apache.ignite.plugin.security.SecurityPermission;
/**
* Cache get or create with configuration request.
@@ -51,8 +50,7 @@ public class ClientCacheGetOrCreateWithConfigurationRequest extends ClientReques
/** {@inheritDoc} */
@Override public ClientResponse process(ClientConnectionContext ctx) {
try {
- // Use security exception handler since the code authorizes "enable on-heap cache" permission
- runWithSecurityExceptionHandler(() -> ctx.kernalContext().grid().getOrCreateCache(cacheCfg));
+ ctx.kernalContext().grid().getOrCreateCache(cacheCfg);
}
catch (CacheExistsException e) {
throw new IgniteClientException(ClientStatus.CACHE_EXISTS, e.getMessage());