GG-10385 Interop .Net: Leak in GridMessagingTest
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4f3788d5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4f3788d5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4f3788d5 Branch: refs/heads/ignite-916 Commit: 4f3788d58157f97c097bbdbf517fadf142a31662 Parents: 6ed4eca Author: ptupitsyn <ptupit...@gridgain.com> Authored: Tue Jun 2 11:30:27 2015 +0300 Committer: ptupitsyn <ptupit...@gridgain.com> Committed: Tue Jun 2 11:30:27 2015 +0300 ---------------------------------------------------------------------- .../internal/managers/communication/GridIoManager.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4f3788d5/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java index c877d57..6e8d457 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java @@ -1211,6 +1211,11 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa public void addUserMessageListener(@Nullable final Object topic, @Nullable final IgniteBiPredicate<UUID, ?> p) { if (p != null) { try { + if (p instanceof GridLifecycleAwareMessageFilter) + ((GridLifecycleAwareMessageFilter)p).initialize(ctx); + else + ctx.resource().injectGeneric(p); + addMessageListener(TOPIC_COMM_USER, new GridUserMessageListener(topic, (IgniteBiPredicate<UUID, Object>)p)); } @@ -1695,13 +1700,6 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa throws IgniteCheckedException { this.topic = topic; this.predLsnr = predLsnr; - - if (predLsnr != null) { - if (predLsnr instanceof GridLifecycleAwareMessageFilter) - ((GridLifecycleAwareMessageFilter)predLsnr).initialize(ctx); - else - ctx.resource().injectGeneric(predLsnr); - } } /** {@inheritDoc} */
