Repository: ignite Updated Branches: refs/heads/ignite-1537 7cf8ed26b -> 3938d2986
ignite-1.5 Fixed hang on metadata update inside put in atomic cache when topology read lock is held. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3938d298 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3938d298 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3938d298 Branch: refs/heads/ignite-1537 Commit: 3938d2986ddcad641d24f08d311500866aa419d2 Parents: 7cf8ed2 Author: sboikov <sboi...@gridgain.com> Authored: Tue Dec 22 18:02:10 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Tue Dec 22 18:02:10 2015 +0300 ---------------------------------------------------------------------- .../ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/3938d298/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java index dcab5b2..0df7da6 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java @@ -897,8 +897,8 @@ public class TcpDiscoverySelfTest extends GridCommonAbstractTest { */ public void testIpFinderCleaning() throws Exception { try { - ipFinder.registerAddresses(Arrays.asList(new InetSocketAddress("host1", 1024), - new InetSocketAddress("host2", 1024))); + ipFinder.registerAddresses(Arrays.asList(new InetSocketAddress("1.1.1.1", 1024), + new InetSocketAddress("1.1.1.2", 1024))); Ignite g1 = startGrid(1); @@ -923,8 +923,8 @@ public class TcpDiscoverySelfTest extends GridCommonAbstractTest { // Check that missing addresses are returned back. ipFinder.unregisterAddresses(ipFinder.getRegisteredAddresses()); // Unregister valid address. - ipFinder.registerAddresses(Arrays.asList(new InetSocketAddress("host1", 1024), - new InetSocketAddress("host2", 1024))); + ipFinder.registerAddresses(Arrays.asList(new InetSocketAddress("1.1.1.1", 1024), + new InetSocketAddress("1.1.1.2", 1024))); GridTestUtils.waitForCondition(new GridAbsPredicate() { @Override public boolean apply() {