Repository: ignite Updated Branches: refs/heads/ignite-1537 347b90735 -> d45ec9af3
ignite-1.5 Fixed GridNearAtomicUpdateFuture to do not complete future before near cache is updated Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d45ec9af Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d45ec9af Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d45ec9af Branch: refs/heads/ignite-1537 Commit: d45ec9af31986d974d80d7251802a466e9d6f75a Parents: 347b907 Author: sboikov <[email protected]> Authored: Mon Dec 14 16:14:19 2015 +0300 Committer: sboikov <[email protected]> Committed: Mon Dec 14 16:14:19 2015 +0300 ---------------------------------------------------------------------- .../ignite/testframework/junits/GridAbstractTest.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/d45ec9af/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java index b83cba9..99d1a42 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java @@ -1286,15 +1286,17 @@ public abstract class GridAbstractTest extends TestCase { String mcastAddr = GridTestUtils.getNextMulticastGroup(getClass()); - if (!F.isEmpty(mcastAddr)) { - TcpDiscoveryMulticastIpFinder ipFinder = new TcpDiscoveryMulticastIpFinder(); + TcpDiscoveryMulticastIpFinder ipFinder = new TcpDiscoveryMulticastIpFinder(); + + ipFinder.setAddresses(Collections.singleton("127.0.0.1:" + TcpDiscoverySpi.DFLT_PORT)); + if (!F.isEmpty(mcastAddr)) { ipFinder.setMulticastGroup(mcastAddr); ipFinder.setMulticastPort(GridTestUtils.getNextMulticastPort(getClass())); - - discoSpi.setIpFinder(ipFinder); } + discoSpi.setIpFinder(ipFinder); + cfg.setDiscoverySpi(discoSpi); SharedFsCheckpointSpi cpSpi = new SharedFsCheckpointSpi();
