#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/9142eb7c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9142eb7c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9142eb7c Branch: refs/heads/ignite-yardstick-client Commit: 9142eb7ce1cb0f665c129580a3a611a6ad5dce1e Parents: 092bb91 Author: nikolay_tikhonov <ntikho...@gridgain.com> Authored: Wed Jun 17 10:30:04 2015 +0300 Committer: nikolay_tikhonov <ntikho...@gridgain.com> Committed: Wed Jun 17 10:30:04 2015 +0300 ---------------------------------------------------------------------- .../impl/GridTcpRouterNioListenerAdapter.java | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9142eb7c/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterNioListenerAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterNioListenerAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterNioListenerAdapter.java index 0bf416c..e60f2aa 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterNioListenerAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterNioListenerAdapter.java @@ -25,8 +25,10 @@ import org.apache.ignite.internal.client.marshaller.optimized.*; import org.apache.ignite.internal.processors.rest.client.message.*; import org.apache.ignite.internal.util.nio.*; import org.apache.ignite.internal.util.typedef.internal.*; +import org.apache.ignite.plugin.*; import org.jetbrains.annotations.*; +import java.security.*; import java.util.*; import static org.apache.ignite.internal.util.nio.GridNioSessionMetaKey.*; @@ -65,7 +67,20 @@ public abstract class GridTcpRouterNioListenerAdapter implements GridNioServerLi marshMap = new HashMap<>(); - marshMap.put(GridClientOptimizedMarshaller.ID, new GridClientOptimizedMarshaller()); + List<PluginProvider> plugins = AccessController.doPrivileged(new PrivilegedAction<List<PluginProvider>>() { + @Override public List<PluginProvider> run() { + List<PluginProvider> providers = new ArrayList<>(); + + ServiceLoader<PluginProvider> ldr = ServiceLoader.load(PluginProvider.class); + + for (PluginProvider provider : ldr) + providers.add(provider); + + return providers; + } + }); + + marshMap.put(GridClientOptimizedMarshaller.ID, new GridClientOptimizedMarshaller(plugins)); marshMap.put(GridClientJdkMarshaller.ID, new GridClientJdkMarshaller()); init();
