From 5d303c61028deed96c2b4fe481c5b1785ffaca01 Mon Sep 17 00:00:00 2001 From: dsyer Date: Mon, 13 Apr 2009 11:44:52 +0000 Subject: [PATCH] RESOLVED - issue BATCH-1202: Improve error message when neither commit-interval nor chunk-completion-policy are specified on a chuck (xml namespace) --- .../core/configuration/xml/ChunkElementParser.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/ChunkElementParser.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/ChunkElementParser.java index 42cecba6e..3e3f1db15 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/ChunkElementParser.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/ChunkElementParser.java @@ -99,9 +99,17 @@ public class ChunkElementParser { if (!underspecified && propertyValues.contains("commitInterval") == propertyValues.contains("chunkCompletionPolicy")) { - parserContext.getReaderContext().error( - "The <" + element.getNodeName() + "/> element must contain either '" + COMMIT_INTERVAL_ATTR + "' " - + "or '" + CHUNK_COMPLETION_POLICY_ATTR + "', but not both.", element); + if (propertyValues.contains("commitInterval")) { + parserContext.getReaderContext().error( + "The <" + element.getNodeName() + "/> element must contain either '" + COMMIT_INTERVAL_ATTR + + "' " + "or '" + CHUNK_COMPLETION_POLICY_ATTR + "', but not both.", element); + } + else { + parserContext.getReaderContext().error( + "The <" + element.getNodeName() + "/> element must contain either '" + COMMIT_INTERVAL_ATTR + + "' " + "or '" + CHUNK_COMPLETION_POLICY_ATTR + "'.", element); + + } } String skipLimit = element.getAttribute("skip-limit");