Skip to content

Commit 5464d35

Browse files
authored
IGNITE-24256 Fixed NullPointerException during stop of TcpDiscoveryMulticastIpFinder. (#11823)
1 parent a08bbfd commit 5464d35

File tree

2 files changed

+17
-1
lines changed

2 files changed

+17
-1
lines changed

modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,8 @@ public TcpDiscoveryMulticastIpFinder setMulticastGroup(String mcastGrp) {
167167
/** @param ignite Ignite instance. */
168168
@IgniteInstanceResource
169169
public void setIgnite(IgniteEx ignite) {
170-
marsh = ignite.context().marshallerContext().jdkMarshaller();
170+
if (ignite != null)
171+
marsh = ignite.context().marshallerContext().jdkMarshaller();
171172
}
172173

173174
/**

modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiMulticastTest.java

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
import org.apache.ignite.spi.discovery.DiscoverySpi;
3131
import org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.TcpDiscoveryMulticastIpFinder;
3232
import org.apache.ignite.testframework.GridTestUtils;
33+
import org.apache.ignite.testframework.ListeningTestLogger;
34+
import org.apache.ignite.testframework.LogListener;
3335
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
3436
import org.junit.Test;
3537

@@ -47,6 +49,11 @@ public class TcpClientDiscoverySpiMulticastTest extends GridCommonAbstractTest {
4749
/** */
4850
private ThreadLocal<Integer> discoPort = new ThreadLocal<>();
4951

52+
/** */
53+
private LogListener logLsnr = LogListener
54+
.matches("Failed to remove injected resources from SPI")
55+
.build();
56+
5057
/** {@inheritDoc} */
5158
@Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
5259
IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
@@ -78,6 +85,12 @@ public class TcpClientDiscoverySpiMulticastTest extends GridCommonAbstractTest {
7885

7986
cfg.setDiscoverySpi(spi);
8087

88+
ListeningTestLogger listeningLog = new ListeningTestLogger(log);
89+
90+
listeningLog.registerListener(logLsnr);
91+
92+
cfg.setGridLogger(listeningLog);
93+
8194
return cfg;
8295
}
8396

@@ -86,6 +99,8 @@ public class TcpClientDiscoverySpiMulticastTest extends GridCommonAbstractTest {
8699
super.afterTest();
87100

88101
stopAllGrids();
102+
103+
assertFalse(logLsnr.check());
89104
}
90105

91106
/**

0 commit comments

Comments
 (0)