GG-12194: Backport GG-12184 into 8.0.3.ea8
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f0078561 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f0078561 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f0078561 Branch: refs/heads/ignite-5398 Commit: f00785611e1d785fe8c2247770bf07e07ddb1ebe Parents: 643e6d4 Author: Ivan Rakov <[email protected]> Authored: Fri May 12 19:39:52 2017 +0300 Committer: Ivan Rakov <[email protected]> Committed: Fri May 12 19:39:52 2017 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/internal/MarshallerContextAdapter.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/f0078561/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextAdapter.java index ad34393..5da0b9c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextAdapter.java @@ -91,11 +91,11 @@ public abstract class MarshallerContextAdapter implements MarshallerContext { if (plugins != null && !plugins.isEmpty()) { for (PluginProvider plugin : plugins) { - URL pluginClsNames = ldr.getResource("META-INF/" + plugin.name().toLowerCase() + Enumeration<URL> pluginUrls = ldr.getResources("META-INF/" + plugin.name().toLowerCase() + ".classnames.properties"); - if (pluginClsNames != null) - processResource(pluginClsNames); + while (pluginUrls.hasMoreElements()) + processResource(pluginUrls.nextElement()); } } }
