From b5335e71cc623b6e4d913409c58654e9f23bf60f Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Wed, 16 Jan 2008 04:38:24 +0000 Subject: [PATCH] Setting result prior to counting down latch. --- .../springframework/integration/adapter/AdapterTests.java | 8 ++------ .../org/springframework/integration/adapter/TestSink.java | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/spring-integration-core/src/test/java/org/springframework/integration/adapter/AdapterTests.java b/spring-integration-core/src/test/java/org/springframework/integration/adapter/AdapterTests.java index a92063b8d3..420986231b 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/adapter/AdapterTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/adapter/AdapterTests.java @@ -42,11 +42,9 @@ public class AdapterTests { sink.setLatch(latch); assertNull(sink.get()); context.start(); - String result = null; latch.await(3000, TimeUnit.MILLISECONDS); assertEquals("latch should have counted down within allotted time", 0, latch.getCount()); - result = sink.get(); - assertNotNull(result); + assertNotNull(sink.get()); context.close(); } @@ -58,11 +56,9 @@ public class AdapterTests { sink.setLatch(latch); assertNull(sink.get()); context.start(); - String result = null; latch.await(3000, TimeUnit.MILLISECONDS); assertEquals("latch should have counted down within allotted time", 0, latch.getCount()); - result = sink.get(); - assertNotNull(result); + assertNotNull(sink.get()); context.close(); } diff --git a/spring-integration-core/src/test/java/org/springframework/integration/adapter/TestSink.java b/spring-integration-core/src/test/java/org/springframework/integration/adapter/TestSink.java index 3836669a3e..c45b6dd6f1 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/adapter/TestSink.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/adapter/TestSink.java @@ -43,10 +43,10 @@ public class TestSink { } public void store(String s) { + this.result = s; if (this.latch != null) { this.latch.countDown(); } - this.result = s; } public String get() {