From 2540b4aa4869b6a96042bade72b76fb8eb582fcc Mon Sep 17 00:00:00 2001 From: David Syer Date: Fri, 18 Jun 2010 14:47:55 +0000 Subject: [PATCH] INT-1069: fix build failure caused by incomplete commit --- .../springframework/integration/jdbc/JdbcMessageStore.java | 4 +--- .../integration/jdbc/JdbcMessageStoreChannelTests.java | 6 +++--- .../integration/jdbc/JdbcMessageStoreTests.java | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/JdbcMessageStore.java b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/JdbcMessageStore.java index 10d00a8b0b..3d87c07155 100644 --- a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/JdbcMessageStore.java +++ b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/JdbcMessageStore.java @@ -294,9 +294,7 @@ public class JdbcMessageStore extends AbstractMessageGroupStore implements Messa } }); - group.markAll(); - - return group; + return getMessageGroup(group.getCorrelationKey()); } diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcMessageStoreChannelTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcMessageStoreChannelTests.java index f5450f9cc8..a5e8c2fde9 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcMessageStoreChannelTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcMessageStoreChannelTests.java @@ -2,8 +2,8 @@ package org.springframework.integration.jdbc; import static org.junit.Assert.assertEquals; -import java.util.ArrayList; import java.util.List; +import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -72,7 +72,7 @@ public class JdbcMessageStoreChannelTests { public static class Service { private static boolean fail = false; - private static List messages = new ArrayList(); + private static List messages = new CopyOnWriteArrayList(); private static CountDownLatch latch = new CountDownLatch(0); public static void reset(int count) { fail = false; @@ -83,8 +83,8 @@ public class JdbcMessageStoreChannelTests { latch.await(timeout, TimeUnit.MILLISECONDS); } public String echo(String input) { - latch.countDown(); messages.add(input); + latch.countDown(); if (fail) { throw new RuntimeException("Planned failure"); } diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcMessageStoreTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcMessageStoreTests.java index 0c58556e11..84b6968bea 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcMessageStoreTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcMessageStoreTests.java @@ -154,7 +154,7 @@ public class JdbcMessageStoreTests { Message message = MessageBuilder.withPayload("foo").setCorrelationId(correlationId).build(); messageStore.addMessageToGroup(correlationId, message); MessageGroup group = messageStore.getMessageGroup(correlationId); - messageStore.markMessageGroup(group); + group = messageStore.markMessageGroup(group); assertEquals(1, group.getMarked().size()); }