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 6627D17449 for ; Fri, 19 Jun 2015 07:55:07 +0000 (UTC) Received: (qmail 17224 invoked by uid 500); 19 Jun 2015 07:55:07 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 17195 invoked by uid 500); 19 Jun 2015 07:55:07 -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 17147 invoked by uid 99); 19 Jun 2015 07:55:07 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Jun 2015 07:55:07 +0000 X-ASF-Spam-Status: No, hits=-2000.4 required=5.0 tests=ALL_TRUSTED,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, 19 Jun 2015 07:52:55 +0000 Received: (qmail 16316 invoked by uid 99); 19 Jun 2015 07:54:39 -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, 19 Jun 2015 07:54:39 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1E104E091F; Fri, 19 Jun 2015 07:54:39 +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: Fri, 19 Jun 2015 07:54:57 -0000 Message-Id: In-Reply-To: <0484ade3dc3543cb940d6477d02065ef@git.apache.org> References: <0484ade3dc3543cb940d6477d02065ef@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [20/50] incubator-ignite git commit: #IGNITE-GG-10429 Fixed client marshaller. X-Virus-Checked: Checked by ClamAV on apache.org #IGNITE-GG-10429 Fixed client marshaller. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/092bb91f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/092bb91f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/092bb91f Branch: refs/heads/ignite-yardstick-client Commit: 092bb91f1cf8b99b0f43903fd493d85cac89ee7e Parents: 7785544 Author: nikolay_tikhonov Authored: Wed Jun 17 10:17:49 2015 +0300 Committer: nikolay_tikhonov Committed: Wed Jun 17 10:17:49 2015 +0300 ---------------------------------------------------------------------- .../internal/client/GridClientConfiguration.java | 19 +++++++++++++++++-- .../optimized/GridClientOptimizedMarshaller.java | 5 +++-- 2 files changed, 20 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/092bb91f/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientConfiguration.java index ee16f94..4a909a3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientConfiguration.java @@ -23,10 +23,12 @@ import org.apache.ignite.internal.client.marshaller.optimized.*; import org.apache.ignite.internal.client.ssl.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; +import org.apache.ignite.plugin.*; import org.apache.ignite.plugin.security.*; import org.jetbrains.annotations.*; import java.net.*; +import java.security.*; import java.util.*; import java.util.concurrent.*; @@ -110,7 +112,7 @@ public class GridClientConfiguration { private ExecutorService executor; /** Marshaller. */ - private GridClientMarshaller marshaller = new GridClientOptimizedMarshaller(); + private GridClientMarshaller marshaller; /** Daemon flag. */ private boolean daemon; @@ -119,7 +121,20 @@ public class GridClientConfiguration { * Creates default configuration. */ public GridClientConfiguration() { - // No-op. + List plugins = AccessController.doPrivileged(new PrivilegedAction>() { + @Override public List run() { + List providers = new ArrayList<>(); + + ServiceLoader ldr = ServiceLoader.load(PluginProvider.class); + + for (PluginProvider provider : ldr) + providers.add(provider); + + return providers; + } + }); + + marshaller = new GridClientOptimizedMarshaller(plugins); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/092bb91f/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/optimized/GridClientOptimizedMarshaller.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/optimized/GridClientOptimizedMarshaller.java b/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/optimized/GridClientOptimizedMarshaller.java index 28b129e..0d99d75 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/optimized/GridClientOptimizedMarshaller.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/optimized/GridClientOptimizedMarshaller.java @@ -23,6 +23,7 @@ import org.apache.ignite.internal.client.marshaller.*; import org.apache.ignite.internal.processors.rest.client.message.*; import org.apache.ignite.marshaller.optimized.*; import org.apache.ignite.plugin.*; +import org.jetbrains.annotations.*; import java.io.*; import java.nio.*; @@ -53,7 +54,7 @@ public class GridClientOptimizedMarshaller implements GridClientMarshaller { * * @param plugins Plugins. */ - public GridClientOptimizedMarshaller(List plugins) { + public GridClientOptimizedMarshaller(@Nullable List plugins) { opMarsh = new OptimizedMarshaller(); opMarsh.setContext(new ClientMarshallerContext(plugins)); @@ -121,7 +122,7 @@ public class GridClientOptimizedMarshaller implements GridClientMarshaller { /** * @param plugins Plugins. */ - public ClientMarshallerContext(List plugins) { + public ClientMarshallerContext(@Nullable List plugins) { super(plugins); }