IGNITE-35 Fixed 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/858e87b5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/858e87b5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/858e87b5 Branch: refs/heads/sprint-1 Commit: 858e87b56b5af249d62bde8019b4da801793fb09 Parents: fad0213 Author: nikolay_tikhonov <ntikho...@gridgain.com> Authored: Fri Dec 19 17:21:30 2014 +0300 Committer: nikolay_tikhonov <ntikho...@gridgain.com> Committed: Fri Dec 19 17:31:01 2014 +0300 ---------------------------------------------------------------------- .../tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java | 4 ++-- .../org/gridgain/testframework/junits/GridTestResources.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/858e87b5/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java index e03bd10..e68a46d 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java @@ -589,7 +589,7 @@ public class TcpDiscoveryMulticastIpFinder extends TcpDiscoveryVmIpFinder { * @param sockAddr Optional address multicast socket should be bound to. */ private AddressReceiver(InetAddress mcastAddr, InetAddress sockAddr) { - super(ignite.name(), "tcp-disco-multicast-addr-rcvr", log); + super(ignite == null ? null : ignite.name(), "tcp-disco-multicast-addr-rcvr", log); this.mcastAddr = mcastAddr; this.sockAddr = sockAddr; } @@ -633,7 +633,7 @@ public class TcpDiscoveryMulticastIpFinder extends TcpDiscoveryVmIpFinder { */ private AddressSender(InetAddress mcastGrp, @Nullable InetAddress sockItf, Collection<InetSocketAddress> addrs) throws IOException { - super(ignite.name(), "tcp-disco-multicast-addr-sender", log); + super(ignite == null ? null : ignite.name(), "tcp-disco-multicast-addr-sender", log); this.mcastGrp = mcastGrp; this.addrs = addrs; this.sockItf = sockItf; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/858e87b5/modules/core/src/test/java/org/gridgain/testframework/junits/GridTestResources.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/testframework/junits/GridTestResources.java b/modules/core/src/test/java/org/gridgain/testframework/junits/GridTestResources.java index 51d374e..859abf9 100644 --- a/modules/core/src/test/java/org/gridgain/testframework/junits/GridTestResources.java +++ b/modules/core/src/test/java/org/gridgain/testframework/junits/GridTestResources.java @@ -160,7 +160,7 @@ public class GridTestResources { rsrcProc.injectBasicResource(target, IgniteLoggerResource.class, getLogger().getLogger(target.getClass())); rsrcProc.injectBasicResource(target, IgniteInstanceResource.class, - new GridTestIgnite(null, locHost, nodeId, marshaller, jmx, home)); + new GridTestIgnite(null, locHost, nodeId, getMarshaller(), jmx, home)); } /**
