Repository: incubator-ignite Updated Branches: refs/heads/ignite-1108 37c4bbcd5 -> ea2c972fc
IGNITE-1108 Fixed tests. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ea2c972f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ea2c972f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ea2c972f Branch: refs/heads/ignite-1108 Commit: ea2c972fc0ae9171a1a119976f05c9fe4f572ad1 Parents: 37c4bbc Author: nikolay_tikhonov <[email protected]> Authored: Tue Jul 14 12:53:23 2015 +0300 Committer: nikolay_tikhonov <[email protected]> Committed: Tue Jul 14 13:02:51 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/internal/IgniteKernal.java | 21 +++++++++++--------- .../internal/util/TestPluginProvider.java | 9 +++++++++ 2 files changed, 21 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea2c972f/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java index 5af2f21..36b14f6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java @@ -1801,17 +1801,20 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable { } } - for (PluginProvider plugin : ctx.plugins().allProviders()) { - try { - plugin.onAfterStop(cancel); - } - catch (Throwable e) { - errOnStop = true; + // Invoke callback on plugins. + if (ctx.plugins() != null && ctx.plugins().allProviders() != null) { + for (PluginProvider plugin : ctx.plugins().allProviders()) { + try { + plugin.onAfterStop(cancel); + } + catch (Throwable e) { + errOnStop = true; - U.error(log, "Failed to stop component (ignoring): " + plugin, e); + U.error(log, "Failed to invoke afterStop for plugin (ignoring): " + plugin, e); - if (e instanceof Error) - throw (Error)e; + if (e instanceof Error) + throw (Error)e; + } } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea2c972f/modules/core/src/test/java/org/apache/ignite/internal/util/TestPluginProvider.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/TestPluginProvider.java b/modules/core/src/test/java/org/apache/ignite/internal/util/TestPluginProvider.java index 5380964..3d72198 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/util/TestPluginProvider.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/util/TestPluginProvider.java @@ -67,6 +67,7 @@ public class TestPluginProvider extends PluginProviderAdapter<TestPluginProvider assertFalse(afStart || bfStop || stop || afStop); } + /** {@inheritDoc} */ @Override public void onAfterStart() throws IgniteCheckedException { afStart = true; @@ -74,6 +75,7 @@ public class TestPluginProvider extends PluginProviderAdapter<TestPluginProvider assertFalse(bfStop || stop || afStop); } + /** {@inheritDoc} */ @Override public void onBeforeStop(boolean cancel) { bfStop = true; @@ -81,6 +83,7 @@ public class TestPluginProvider extends PluginProviderAdapter<TestPluginProvider assertFalse(stop || afStop); } + /** {@inheritDoc} */ @Override public void stop(boolean cancel) throws IgniteCheckedException { stop = true; @@ -88,6 +91,7 @@ public class TestPluginProvider extends PluginProviderAdapter<TestPluginProvider assertFalse(afStop); } + /** {@inheritDoc} */ @Override public void onAfterStop(boolean cancel) { if (enableAssert) GridTestUtils.assertThrows(null, new Callable<Object>() { @@ -99,6 +103,11 @@ public class TestPluginProvider extends PluginProviderAdapter<TestPluginProvider afStop = true; } + /** {@inheritDoc} */ + @Override public String version() { + return "0.0.1"; + } + /** */ public static class TestPluginCfg implements PluginConfiguration { // No-op.
