From d38ecfd9557ce6f6478992101fc3e2356fd483f8 Mon Sep 17 00:00:00 2001 From: dsyer Date: Fri, 18 Sep 2009 16:30:45 +0000 Subject: [PATCH] OPEN - issue BATCH-1409: More efficient use of pool threads in repeat template (hence multi-threaded steps) http://jira.springframework.org/browse/BATCH-1409 --- .../TaskExecutorRepeatTemplateAsynchronousTests.java | 1 - ...skExecutorRepeatTemplateBulkAsynchronousTests.java} | 10 ++++++---- 2 files changed, 6 insertions(+), 5 deletions(-) rename spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/{TaskExecutorRepeatTemplateSimpleAsynchronousTests.java => TaskExecutorRepeatTemplateBulkAsynchronousTests.java} (95%) diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/TaskExecutorRepeatTemplateAsynchronousTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/TaskExecutorRepeatTemplateAsynchronousTests.java index a96146153..b195c4dd2 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/TaskExecutorRepeatTemplateAsynchronousTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/TaskExecutorRepeatTemplateAsynchronousTests.java @@ -210,7 +210,6 @@ public class TaskExecutorRepeatTemplateAsynchronousTests extends AbstractTradeBa int frequency = Collections.frequency(items, "null"); // System.err.println("Frequency: "+frequency); assertTrue(frequency <= throttleLimit); - assertTrue(frequency > 1); } /** diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/TaskExecutorRepeatTemplateSimpleAsynchronousTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/TaskExecutorRepeatTemplateBulkAsynchronousTests.java similarity index 95% rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/TaskExecutorRepeatTemplateSimpleAsynchronousTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/TaskExecutorRepeatTemplateBulkAsynchronousTests.java index 5b6b25912..aa9f260dd 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/TaskExecutorRepeatTemplateSimpleAsynchronousTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/TaskExecutorRepeatTemplateBulkAsynchronousTests.java @@ -43,9 +43,9 @@ import org.springframework.core.task.SimpleAsyncTaskExecutor; * @author Dave Syer * */ -public class TaskExecutorRepeatTemplateSimpleAsynchronousTests { +public class TaskExecutorRepeatTemplateBulkAsynchronousTests { - static Log logger = LogFactory.getLog(TaskExecutorRepeatTemplateSimpleAsynchronousTests.class); + static Log logger = LogFactory.getLog(TaskExecutorRepeatTemplateBulkAsynchronousTests.class); private static int TOTAL = 100; @@ -89,7 +89,9 @@ public class TaskExecutorRepeatTemplateSimpleAsynchronousTests { * retry the work.) */ RepeatStatus result = RepeatStatus.continueIf(position != early && item != null); - logger.debug("Returning " + result + " for count=" + position); + if (!result.isContinuable()) { + logger.debug("Returning " + result + " for count=" + position); + } return result; } }; @@ -137,7 +139,7 @@ public class TaskExecutorRepeatTemplateSimpleAsynchronousTests { int frequency = Collections.frequency(items, "null"); // System.err.println("Frequency: " + frequency); // System.err.println("Items: " + items); - // One extra task will be submitted before the termination is detected + // Extra tasks will be submitted before the termination is detected assertEquals(TOTAL, items.size() - frequency); assertTrue(frequency <= throttleLimit + 1);