From 1658a8a664dd105f8e31d0d9707c22d86da9c3bf Mon Sep 17 00:00:00 2001 From: Rob Austin Date: Tue, 11 Nov 2014 17:47:31 +0000 Subject: [PATCH 1/7] added time to close makes the test more stable --- .../net/openhft/chronicle/map/StatelessChronicleMap.java | 6 ++++++ .../chronicle/map/jrs166/map/StatelessChronicleMapTest.java | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/openhft/chronicle/map/StatelessChronicleMap.java b/src/main/java/net/openhft/chronicle/map/StatelessChronicleMap.java index 0004e2081..7ef2ea9e5 100644 --- a/src/main/java/net/openhft/chronicle/map/StatelessChronicleMap.java +++ b/src/main/java/net/openhft/chronicle/map/StatelessChronicleMap.java @@ -235,6 +235,12 @@ class StatelessChronicleMap implements ChronicleMap, Closeable { if (closeables != null) closeables.closeQuietly(); closeables = null; + try { + // give time to close + Thread.sleep(10); + } catch (InterruptedException e) { + // + } } /** diff --git a/src/test/java/net/openhft/chronicle/map/jrs166/map/StatelessChronicleMapTest.java b/src/test/java/net/openhft/chronicle/map/jrs166/map/StatelessChronicleMapTest.java index bbde965bb..c7f608e68 100644 --- a/src/test/java/net/openhft/chronicle/map/jrs166/map/StatelessChronicleMapTest.java +++ b/src/test/java/net/openhft/chronicle/map/jrs166/map/StatelessChronicleMapTest.java @@ -561,7 +561,7 @@ public class StatelessChronicleMapTest extends JSR166TestCase { /** * size returns the correct values */ - @Test(timeout = 5000) + @Test(timeout = 10000) public void testSize2() throws IOException { try (ChronicleMap map = map5(8076)) { @@ -619,7 +619,7 @@ public class StatelessChronicleMapTest extends JSR166TestCase { */ @Test(timeout = 5000) public void testContainsKey_NullPointerException() throws IOException { - try (ChronicleMap c = newShmIntString(8079)) { + try (ChronicleMap c = newShmIntString(8076)) { c.containsKey(null); shouldThrow(); } catch (NullPointerException success) { From 96f59131b1107e20500988318a93c68f7995d6b4 Mon Sep 17 00:00:00 2001 From: Rob Austin Date: Tue, 11 Nov 2014 17:59:13 +0000 Subject: [PATCH 2/7] added time to close makes the test more stable --- .../java/net/openhft/chronicle/map/StatelessChronicleMap.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/openhft/chronicle/map/StatelessChronicleMap.java b/src/main/java/net/openhft/chronicle/map/StatelessChronicleMap.java index 7ef2ea9e5..b43df4ff2 100644 --- a/src/main/java/net/openhft/chronicle/map/StatelessChronicleMap.java +++ b/src/main/java/net/openhft/chronicle/map/StatelessChronicleMap.java @@ -237,7 +237,7 @@ class StatelessChronicleMap implements ChronicleMap, Closeable { closeables = null; try { // give time to close - Thread.sleep(10); + Thread.sleep(30); } catch (InterruptedException e) { // } From 32cbe99c56c8861a5482afa26b1ad655128a7981 Mon Sep 17 00:00:00 2001 From: Team City Date: Tue, 11 Nov 2014 18:02:46 +0000 Subject: [PATCH 3/7] [maven-release-plugin] prepare release chronicle-map-2.0.9b --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 12a1c3ef0..fca820ade 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ 4.0.0 chronicle-map - 2.0.9b-SNAPSHOT + 2.0.9b OpenHFT/Chronicle-Map Chronicle-Map @@ -157,7 +157,7 @@ scm:git:git@github.com:OpenHFT/Chronicle-Map.git scm:git:git@github.com:OpenHFT/Chronicle-Map.git scm:git:git@github.com:OpenHFT/Chronicle-Map.git - master + chronicle-map-2.0.9b From 36eaadd7b44c1e64c1dd8201ef70d44f07f5f053 Mon Sep 17 00:00:00 2001 From: Team City Date: Tue, 11 Nov 2014 18:02:51 +0000 Subject: [PATCH 4/7] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index fca820ade..274f3fff8 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ 4.0.0 chronicle-map - 2.0.9b + 2.0.10b-SNAPSHOT OpenHFT/Chronicle-Map Chronicle-Map @@ -157,7 +157,7 @@ scm:git:git@github.com:OpenHFT/Chronicle-Map.git scm:git:git@github.com:OpenHFT/Chronicle-Map.git scm:git:git@github.com:OpenHFT/Chronicle-Map.git - chronicle-map-2.0.9b + master From 4926147e36bc245a348ab09c77ca981d52aa2d28 Mon Sep 17 00:00:00 2001 From: Team City Date: Tue, 11 Nov 2014 18:17:54 +0000 Subject: [PATCH 5/7] [maven-release-plugin] prepare release chronicle-map-2.0.10b --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 274f3fff8..0abe775c8 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ 4.0.0 chronicle-map - 2.0.10b-SNAPSHOT + 2.0.10b OpenHFT/Chronicle-Map Chronicle-Map @@ -157,7 +157,7 @@ scm:git:git@github.com:OpenHFT/Chronicle-Map.git scm:git:git@github.com:OpenHFT/Chronicle-Map.git scm:git:git@github.com:OpenHFT/Chronicle-Map.git - master + chronicle-map-2.0.10b From 8a910c9706eac3c00776ac00d0cb6ae8307e9aaa Mon Sep 17 00:00:00 2001 From: Team City Date: Tue, 11 Nov 2014 18:17:59 +0000 Subject: [PATCH 6/7] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 0abe775c8..e503c710c 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ 4.0.0 chronicle-map - 2.0.10b + 2.0.11b-SNAPSHOT OpenHFT/Chronicle-Map Chronicle-Map @@ -157,7 +157,7 @@ scm:git:git@github.com:OpenHFT/Chronicle-Map.git scm:git:git@github.com:OpenHFT/Chronicle-Map.git scm:git:git@github.com:OpenHFT/Chronicle-Map.git - chronicle-map-2.0.10b + master From 054c7aee6cb752e47ad3777f471fc94ca811e29c Mon Sep 17 00:00:00 2001 From: Rob Austin Date: Tue, 11 Nov 2014 18:37:14 +0000 Subject: [PATCH 7/7] added time to close makes the test more stable --- .../java/net/openhft/chronicle/map/StatelessChronicleMap.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/openhft/chronicle/map/StatelessChronicleMap.java b/src/main/java/net/openhft/chronicle/map/StatelessChronicleMap.java index b43df4ff2..108ed1dc5 100644 --- a/src/main/java/net/openhft/chronicle/map/StatelessChronicleMap.java +++ b/src/main/java/net/openhft/chronicle/map/StatelessChronicleMap.java @@ -237,7 +237,7 @@ class StatelessChronicleMap implements ChronicleMap, Closeable { closeables = null; try { // give time to close - Thread.sleep(30); + Thread.sleep(100); } catch (InterruptedException e) { // }