You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/06/02 17:50:29 UTC
[01/10] incubator-ignite git commit: # ignite-sprint-5 disabled
hanging test
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-968 3ebb1c03a -> f71177330
# ignite-sprint-5 disabled hanging test
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6ed4ecaa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6ed4ecaa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6ed4ecaa
Branch: refs/heads/ignite-968
Commit: 6ed4ecaa459492e3caa983b9d3889bef8855e516
Parents: 2f61522
Author: sboikov <sb...@gridgain.com>
Authored: Tue Jun 2 10:58:52 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Jun 2 10:58:52 2015 +0300
----------------------------------------------------------------------
.../apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6ed4ecaa/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
index f42963a..e435ed7 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
@@ -62,7 +62,7 @@ public class IgniteCacheQuerySelfTestSuite extends TestSuite {
suite.addTestSuite(IgniteCacheQueryMultiThreadedOffHeapTiredSelfTest.class);
suite.addTestSuite(IgniteCacheQueryEvictsMultiThreadedSelfTest.class);
suite.addTestSuite(IgniteCacheQueryOffheapMultiThreadedSelfTest.class);
- suite.addTestSuite(IgniteCacheQueryOffheapEvictsMultiThreadedSelfTest.class);
+ // suite.addTestSuite(IgniteCacheQueryOffheapEvictsMultiThreadedSelfTest.class); TODO IGNITE-971.
suite.addTestSuite(IgniteCacheSqlQueryMultiThreadedSelfTest.class);
suite.addTestSuite(IgniteCacheOffheapTieredMultithreadedSelfTest.class);
// suite.addTestSuite(IgniteCacheQueryNodeRestartSelfTest.class); TODO IGNITE-484
[09/10] incubator-ignite git commit: Merge remote-tracking branch
'origin/ignite-sprint-5' into ignite-sprint-5
Posted by sb...@apache.org.
Merge remote-tracking branch 'origin/ignite-sprint-5' into ignite-sprint-5
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8719b735
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8719b735
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8719b735
Branch: refs/heads/ignite-968
Commit: 8719b735123b62e40acedecdce63b361a9f99e6b
Parents: 51ef9a9 4f7f58e
Author: avinogradov <av...@gridgain.com>
Authored: Tue Jun 2 17:33:41 2015 +0300
Committer: avinogradov <av...@gridgain.com>
Committed: Tue Jun 2 17:33:41 2015 +0300
----------------------------------------------------------------------
.../ignite/cache/eviction/random/RandomEvictionPolicy.java | 3 ++-
.../cache/distributed/dht/preloader/GridDhtPreloader.java | 9 ++++++---
.../random/RandomEvictionPolicyCacheSizeSelfTest.java | 6 ++++++
3 files changed, 14 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
[08/10] incubator-ignite git commit: GG-10390
Posted by sb...@apache.org.
GG-10390
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/51ef9a9b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/51ef9a9b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/51ef9a9b
Branch: refs/heads/ignite-968
Commit: 51ef9a9bdb13d6c20f0ef1a5a3a160abf4cea103
Parents: 45566fe
Author: avinogradov <av...@gridgain.com>
Authored: Tue Jun 2 17:33:20 2015 +0300
Committer: avinogradov <av...@gridgain.com>
Committed: Tue Jun 2 17:33:20 2015 +0300
----------------------------------------------------------------------
assembly/dependencies-visor-console.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/51ef9a9b/assembly/dependencies-visor-console.xml
----------------------------------------------------------------------
diff --git a/assembly/dependencies-visor-console.xml b/assembly/dependencies-visor-console.xml
index 949943d..d773769 100644
--- a/assembly/dependencies-visor-console.xml
+++ b/assembly/dependencies-visor-console.xml
@@ -61,9 +61,6 @@
<include>scala-*.jar</include>
<include>spring-*.jar</include>
</includes>
- <excludes>
- <exclude>spring-jdbc-*.jar</exclude>
- </excludes>
</fileSet>
<fileSet>
@@ -93,6 +90,9 @@
<fileSet>
<directory>target/libs</directory>
<outputDirectory>/visor-common</outputDirectory>
+ <excludes>
+ <exclude>spring-jdbc-*.jar</exclude>
+ </excludes>
</fileSet>
<fileSet>
[06/10] incubator-ignite git commit: # ignite-sprint-5 potential NPE
in syncFuture listener
Posted by sb...@apache.org.
# ignite-sprint-5 potential NPE in syncFuture listener
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/82cfb47c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/82cfb47c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/82cfb47c
Branch: refs/heads/ignite-968
Commit: 82cfb47cd652895d517dae50d670f13f7fcb9065
Parents: 45566fe
Author: sboikov <sb...@gridgain.com>
Authored: Tue Jun 2 16:03:21 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Jun 2 16:03:21 2015 +0300
----------------------------------------------------------------------
.../cache/distributed/dht/preloader/GridDhtPreloader.java | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/82cfb47c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
index dc81993..1aef18c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
@@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.cache.distributed.dht.preloader;
import org.apache.ignite.*;
import org.apache.ignite.cluster.*;
+import org.apache.ignite.configuration.*;
import org.apache.ignite.events.*;
import org.apache.ignite.internal.*;
import org.apache.ignite.internal.cluster.*;
@@ -227,12 +228,14 @@ public class GridDhtPreloader extends GridCachePreloaderAdapter {
final long start = U.currentTimeMillis();
- if (cctx.config().getRebalanceDelay() >= 0) {
- U.log(log, "Starting rebalancing in " + cctx.config().getRebalanceMode() + " mode: " + cctx.name());
+ final CacheConfiguration cfg = cctx.config();
+
+ if (cfg.getRebalanceDelay() >= 0) {
+ U.log(log, "Starting rebalancing in " + cfg.getRebalanceMode() + " mode: " + cctx.name());
demandPool.syncFuture().listen(new CI1<Object>() {
@Override public void apply(Object t) {
- U.log(log, "Completed rebalancing in " + cctx.config().getRebalanceMode() + " mode " +
+ U.log(log, "Completed rebalancing in " + cfg.getRebalanceMode() + " mode " +
"[cache=" + cctx.name() + ", time=" + (U.currentTimeMillis() - start) + " ms]");
}
});
[04/10] incubator-ignite git commit: # Fix log message message
Posted by sb...@apache.org.
# Fix log message message
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1dbdd425
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1dbdd425
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1dbdd425
Branch: refs/heads/ignite-968
Commit: 1dbdd4252e42b040fa711db673ab98660894c81a
Parents: c6b5817
Author: sevdokimov <se...@jetbrains.com>
Authored: Tue Jun 2 13:01:16 2015 +0300
Committer: sevdokimov <se...@jetbrains.com>
Committed: Tue Jun 2 13:01:16 2015 +0300
----------------------------------------------------------------------
.../java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1dbdd425/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
index f9b5053..70bc9fb 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
@@ -1274,7 +1274,7 @@ public class TcpDiscoverySpi extends IgniteSpiAdapter implements DiscoverySpi, T
catch (IOException | IgniteCheckedException e) {
if (X.hasCause(e, SocketTimeoutException.class))
LT.warn(log, null, "Timed out waiting for message to be read (most probably, the reason is " +
- "in long GC pauses on remote node). Current timeout: " + timeout + '.');
+ "in long GC pauses on remote node) [curTimeout=" + timeout + ']');
throw e;
}
[07/10] incubator-ignite git commit: ignite-937 RandomEvictionPolicy
calculates cache size incorrectly
Posted by sb...@apache.org.
ignite-937 RandomEvictionPolicy calculates cache size incorrectly
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4f7f58ef
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4f7f58ef
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4f7f58ef
Branch: refs/heads/ignite-968
Commit: 4f7f58ef755da6bf2e26e60ab9d015644350abff
Parents: 82cfb47
Author: agura <ag...@gridgain.com>
Authored: Wed May 27 16:28:02 2015 +0300
Committer: agura <ag...@gridgain.com>
Committed: Tue Jun 2 17:00:38 2015 +0300
----------------------------------------------------------------------
.../ignite/cache/eviction/random/RandomEvictionPolicy.java | 3 ++-
.../eviction/random/RandomEvictionPolicyCacheSizeSelfTest.java | 6 ++++++
2 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4f7f58ef/modules/core/src/main/java/org/apache/ignite/cache/eviction/random/RandomEvictionPolicy.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/eviction/random/RandomEvictionPolicy.java b/modules/core/src/main/java/org/apache/ignite/cache/eviction/random/RandomEvictionPolicy.java
index c88b31d..0ac9197 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/eviction/random/RandomEvictionPolicy.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/eviction/random/RandomEvictionPolicy.java
@@ -18,6 +18,7 @@
package org.apache.ignite.cache.eviction.random;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.cache.eviction.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.internal.util.typedef.internal.*;
@@ -87,7 +88,7 @@ public class RandomEvictionPolicy<K, V> implements EvictionPolicy<K, V>, RandomE
IgniteCache<K, V> cache = entry.unwrap(IgniteCache.class);
- int size = cache.size();
+ int size = cache.localSize(CachePeekMode.ONHEAP);
for (int i = max; i < size; i++) {
Cache.Entry<K, V> e = cache.randomEntry();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4f7f58ef/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/random/RandomEvictionPolicyCacheSizeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/random/RandomEvictionPolicyCacheSizeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/random/RandomEvictionPolicyCacheSizeSelfTest.java
index e9e7228..2a2004e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/random/RandomEvictionPolicyCacheSizeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/random/RandomEvictionPolicyCacheSizeSelfTest.java
@@ -18,6 +18,7 @@
package org.apache.ignite.internal.processors.cache.eviction.random;
import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
import org.apache.ignite.cache.eviction.random.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.testframework.junits.common.*;
@@ -50,6 +51,7 @@ public class RandomEvictionPolicyCacheSizeSelfTest extends GridCommonAbstractTes
IgniteConfiguration cfg = super.getConfiguration(gridName);
CacheConfiguration ccfg = defaultCacheConfiguration();
+ ccfg.setAtomicityMode(CacheAtomicityMode.ATOMIC);
ccfg.setNearConfiguration(null);
ccfg.setEvictionPolicy(new RandomEvictionPolicy(PLC_MAX_SIZE));
@@ -67,6 +69,10 @@ public class RandomEvictionPolicyCacheSizeSelfTest extends GridCommonAbstractTes
for (int i = 0; i < KEYS_CNT; i++)
cache.put(i, i);
+ // Ensure that all entries accessed without data races and cache size will correct
+ for (int i = 0; i < KEYS_CNT; i++)
+ cache.get(i);
+
assertEquals(PLC_MAX_SIZE * GRID_CNT, cache.size());
}
}
[10/10] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-sprint-5' into ignite-968
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-sprint-5' into ignite-968
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f7117733
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f7117733
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f7117733
Branch: refs/heads/ignite-968
Commit: f7117733048304b02f9565fcf4aeb1fd7614b9c1
Parents: 3ebb1c0 8719b73
Author: sboikov <se...@inria.fr>
Authored: Tue Jun 2 18:50:09 2015 +0300
Committer: sboikov <se...@inria.fr>
Committed: Tue Jun 2 18:50:09 2015 +0300
----------------------------------------------------------------------
assembly/dependencies-visor-console.xml | 3 +++
.../cache/eviction/random/RandomEvictionPolicy.java | 3 ++-
.../internal/managers/communication/GridIoManager.java | 12 +++++-------
.../distributed/dht/preloader/GridDhtPreloader.java | 9 ++++++---
.../ignite/spi/discovery/tcp/TcpDiscoverySpi.java | 2 +-
.../random/RandomEvictionPolicyCacheSizeSelfTest.java | 6 ++++++
.../testsuites/IgniteCacheQuerySelfTestSuite.java | 2 +-
7 files changed, 24 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
[03/10] incubator-ignite git commit: # Fix log message message: add
missing ')'
Posted by sb...@apache.org.
# Fix log message message: add missing ')'
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c6b5817a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c6b5817a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c6b5817a
Branch: refs/heads/ignite-968
Commit: c6b5817a955202b0bfd308066dcccbd199fead13
Parents: 4f3788d
Author: sevdokimov <se...@jetbrains.com>
Authored: Tue Jun 2 13:00:02 2015 +0300
Committer: sevdokimov <se...@jetbrains.com>
Committed: Tue Jun 2 13:00:02 2015 +0300
----------------------------------------------------------------------
.../java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c6b5817a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
index 56fb63f..f9b5053 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
@@ -1274,7 +1274,7 @@ public class TcpDiscoverySpi extends IgniteSpiAdapter implements DiscoverySpi, T
catch (IOException | IgniteCheckedException e) {
if (X.hasCause(e, SocketTimeoutException.class))
LT.warn(log, null, "Timed out waiting for message to be read (most probably, the reason is " +
- "in long GC pauses on remote node. Current timeout: " + timeout + '.');
+ "in long GC pauses on remote node). Current timeout: " + timeout + '.');
throw e;
}
[05/10] incubator-ignite git commit: GG-10390
Posted by sb...@apache.org.
GG-10390
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/45566fe9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/45566fe9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/45566fe9
Branch: refs/heads/ignite-968
Commit: 45566fe9879f0055008b9c6bb40fd6d6926472cb
Parents: 1dbdd42
Author: avinogradov <av...@gridgain.com>
Authored: Tue Jun 2 13:52:21 2015 +0300
Committer: avinogradov <av...@gridgain.com>
Committed: Tue Jun 2 13:52:21 2015 +0300
----------------------------------------------------------------------
assembly/dependencies-visor-console.xml | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/45566fe9/assembly/dependencies-visor-console.xml
----------------------------------------------------------------------
diff --git a/assembly/dependencies-visor-console.xml b/assembly/dependencies-visor-console.xml
index 28151da..949943d 100644
--- a/assembly/dependencies-visor-console.xml
+++ b/assembly/dependencies-visor-console.xml
@@ -61,6 +61,9 @@
<include>scala-*.jar</include>
<include>spring-*.jar</include>
</includes>
+ <excludes>
+ <exclude>spring-jdbc-*.jar</exclude>
+ </excludes>
</fileSet>
<fileSet>
[02/10] incubator-ignite git commit: GG-10385 Interop .Net: Leak in
GridMessagingTest
Posted by sb...@apache.org.
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-968
Commit: 4f3788d58157f97c097bbdbf517fadf142a31662
Parents: 6ed4eca
Author: ptupitsyn <pt...@gridgain.com>
Authored: Tue Jun 2 11:30:27 2015 +0300
Committer: ptupitsyn <pt...@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} */