Repository: incubator-ignite Updated Branches: refs/heads/ignite-239 706f60546 -> 890d6c62d
# gg-9792 - Minor Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3c884b5d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3c884b5d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3c884b5d Branch: refs/heads/ignite-239 Commit: 3c884b5d5f52210ae94aa35fc465a09c8b0025bc Parents: 3114cda Author: Valentin Kulichenko <vkuliche...@gridgain.com> Authored: Wed Feb 18 10:25:26 2015 -0800 Committer: Valentin Kulichenko <vkuliche...@gridgain.com> Committed: Wed Feb 18 10:25:26 2015 -0800 ---------------------------------------------------------------------- .../internal/processors/plugin/IgnitePluginProcessor.java | 8 ++++---- .../java/org/apache/ignite/plugin/ExtensionRegistry.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3c884b5d/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/IgnitePluginProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/IgnitePluginProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/IgnitePluginProcessor.java index 486d6d8..48c6ecb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/IgnitePluginProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/IgnitePluginProcessor.java @@ -51,7 +51,7 @@ public class IgnitePluginProcessor extends GridProcessorAdapter { public IgnitePluginProcessor(GridKernalContext ctx, IgniteConfiguration cfg) { super(ctx); - ExtensionRegistry registry = new ExtensionRegistry(); + ExtensionRegistryImpl registry = new ExtensionRegistryImpl(); if (cfg.getPluginConfigurations() != null) { for (PluginConfiguration pluginCfg : cfg.getPluginConfigurations()) { @@ -109,7 +109,7 @@ public class IgnitePluginProcessor extends GridProcessorAdapter { * @param extensionItf Extension interface class. * @return Returns implementation for provided extension from all plugins. */ - public <T> T[] extensions(Class<T> extensionItf) { + @Nullable public <T extends Extension> T[] extensions(Class<T> extensionItf) { Map<Class<?>, Object[]> extensions = this.extensions; return (T[])extensions.get(extensionItf); @@ -200,12 +200,12 @@ public class IgnitePluginProcessor extends GridProcessorAdapter { /** * */ - private static class ExtensionRegistry implements org.apache.ignite.plugin.ExtensionRegistry { + private static class ExtensionRegistryImpl implements ExtensionRegistry { /** */ private final Map<Class<?>, List<Object>> extensionsCollector = new HashMap<>(); /** {@inheritDoc} */ - @Override public <T> void registerExtension(Class<T> extensionItf, T extensionImpl) { + @Override public <T extends Extension> void registerExtension(Class<T> extensionItf, T extensionImpl) { List<Object> list = extensionsCollector.get(extensionItf); if (list == null) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3c884b5d/modules/core/src/main/java/org/apache/ignite/plugin/ExtensionRegistry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/ExtensionRegistry.java b/modules/core/src/main/java/org/apache/ignite/plugin/ExtensionRegistry.java index 1e9580d..d7c977f 100644 --- a/modules/core/src/main/java/org/apache/ignite/plugin/ExtensionRegistry.java +++ b/modules/core/src/main/java/org/apache/ignite/plugin/ExtensionRegistry.java @@ -28,5 +28,5 @@ public interface ExtensionRegistry { * @param extensionImpl Extension implementation. * @param <T> Extension type. */ - public <T> void registerExtension(Class<T> extensionItf, T extensionImpl); + public <T extends Extension> void registerExtension(Class<T> extensionItf, T extensionImpl); }
