You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2015/05/19 10:11:48 UTC
[1/2] incubator-ignite git commit: # Minor changes.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-gg-9614 4734ae7bc -> 1077edcf8
# Minor changes.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ba7fddb0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ba7fddb0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ba7fddb0
Branch: refs/heads/ignite-gg-9614
Commit: ba7fddb004a840fdad66bc9fd127eafda27fee2f
Parents: 15d55b1
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Mon May 18 17:45:38 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Mon May 18 17:45:38 2015 +0300
----------------------------------------------------------------------
.../ignite/internal/managers/communication/GridIoManager.java | 6 +++---
.../communication/GridLifecycleAwareMessageFilter.java | 5 ++++-
2 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ba7fddb0/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 16d582b..c877d57 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
@@ -1697,10 +1697,10 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
this.predLsnr = predLsnr;
if (predLsnr != null) {
- ctx.resource().injectGeneric(predLsnr);
-
if (predLsnr instanceof GridLifecycleAwareMessageFilter)
- ((GridLifecycleAwareMessageFilter)predLsnr).initialize();
+ ((GridLifecycleAwareMessageFilter)predLsnr).initialize(ctx);
+ else
+ ctx.resource().injectGeneric(predLsnr);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ba7fddb0/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridLifecycleAwareMessageFilter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridLifecycleAwareMessageFilter.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridLifecycleAwareMessageFilter.java
index cb99d2e..f8cd78f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridLifecycleAwareMessageFilter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridLifecycleAwareMessageFilter.java
@@ -17,6 +17,7 @@
package org.apache.ignite.internal.managers.communication;
+import org.apache.ignite.internal.*;
import org.apache.ignite.lang.*;
/**
@@ -25,8 +26,10 @@ import org.apache.ignite.lang.*;
public interface GridLifecycleAwareMessageFilter<K, V> extends IgniteBiPredicate<K, V> {
/**
* Initializes the filter.
+ *
+ * @param ctx Kernal context.
*/
- public void initialize();
+ public void initialize(GridKernalContext ctx);
/**
* Closes the filter.
[2/2] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-sprint-5' into ignite-gg-9614
Posted by vo...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-sprint-5' into ignite-gg-9614
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1077edcf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1077edcf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1077edcf
Branch: refs/heads/ignite-gg-9614
Commit: 1077edcf8c7697b343bd2882f05ac960c025b263
Parents: 4734ae7 ba7fddb
Author: ptupitsyn <pt...@gridgain.com>
Authored: Tue May 19 11:11:37 2015 +0300
Committer: ptupitsyn <pt...@gridgain.com>
Committed: Tue May 19 11:11:37 2015 +0300
----------------------------------------------------------------------
.../ignite/internal/managers/communication/GridIoManager.java | 6 +++---
.../communication/GridLifecycleAwareMessageFilter.java | 5 ++++-
2 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------