You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by na...@apache.org on 2022/06/17 07:44:59 UTC
[ignite] branch master updated: IGNITE-17178 Fixed configured event listeners resource injection order. (#10094)
This is an automated email from the ASF dual-hosted git repository.
namelchev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 84efe1c47b2 IGNITE-17178 Fixed configured event listeners resource injection order. (#10094)
84efe1c47b2 is described below
commit 84efe1c47b2450ffbc3daf8e81b17443e0aafe8a
Author: Mikhail Petrov <32...@users.noreply.github.com>
AuthorDate: Fri Jun 17 10:44:51 2022 +0300
IGNITE-17178 Fixed configured event listeners resource injection order. (#10094)
---
.../internal/managers/eventstorage/GridEventStorageManager.java | 4 ++--
.../internal/managers/events/LifecycleAwareListenerTest.java | 7 +++++++
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java
index 59e1b32544c..3c647a95a68 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java
@@ -287,10 +287,10 @@ public class GridEventStorageManager extends GridManagerAdapter<EventStorageSpi>
if (evtLsnrs != null) {
Set<IgnitePredicate<? extends Event>> lsnrs = evtLsnrs.keySet();
- U.startLifecycleAware(lsnrs);
-
for (IgnitePredicate<? extends Event> lsnr : lsnrs)
addLocalEventListener(lsnr, evtLsnrs.get(lsnr));
+
+ U.startLifecycleAware(lsnrs);
}
startSpi();
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/events/LifecycleAwareListenerTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/events/LifecycleAwareListenerTest.java
index 79d2c6666a1..934995b22c2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/managers/events/LifecycleAwareListenerTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/events/LifecycleAwareListenerTest.java
@@ -24,6 +24,7 @@ import org.apache.ignite.events.Event;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.lang.IgnitePredicate;
import org.apache.ignite.lifecycle.LifecycleAware;
+import org.apache.ignite.resources.IgniteInstanceResource;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.junit.Test;
@@ -58,6 +59,10 @@ public class LifecycleAwareListenerTest extends GridCommonAbstractTest {
/** Is stopped. */
private boolean isStopped;
+ /** */
+ @IgniteInstanceResource
+ private Ignite ignite;
+
/** {@inheritDoc} */
@Override public boolean apply(Event evt) {
return true;
@@ -67,6 +72,8 @@ public class LifecycleAwareListenerTest extends GridCommonAbstractTest {
@Override public void start() throws IgniteException {
assertFalse(isStarted);
+ assertNotNull(ignite);
+
isStarted = true;
}