Skip to content

Commit 78fa263

Browse files
committed
Polish 62a2e65
Add null check for delimiter
1 parent 3f17b90 commit 78fa263

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/builder/FlatFileItemWriterBuilder.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,9 @@ public DelimitedLineAggregator<T> build() {
462462
"A list of field names or a field extractor is required");
463463

464464
DelimitedLineAggregator<T> delimitedLineAggregator = new DelimitedLineAggregator<>();
465-
delimitedLineAggregator.setDelimiter(this.delimiter);
465+
if (this.delimiter != null) {
466+
delimitedLineAggregator.setDelimiter(this.delimiter);
467+
}
466468

467469
if (this.fieldExtractor == null) {
468470
BeanWrapperFieldExtractor<T> beanWrapperFieldExtractor = new BeanWrapperFieldExtractor<>();

spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/builder/FlatFileItemWriterBuilderTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ public void testDelimitedOutputWithEmptyDelimiter() throws Exception {
129129
.lineSeparator("$")
130130
.delimited()
131131
.delimiter("")
132-
.names("first", "second", "third")
132+
.names(new String[] {"first", "second", "third"})
133133
.encoding("UTF-16LE")
134134
.headerCallback(writer1 -> writer1.append("HEADER"))
135135
.footerCallback(writer12 -> writer12.append("FOOTER"))

0 commit comments

Comments
 (0)