From fba1c3adaba603aafed1b08ddf51c7f6d6e9eee6 Mon Sep 17 00:00:00 2001
From: Mahmoud Ben Hassine <mbenhassine@pivotal.io>
Date: Fri, 29 Nov 2019 09:24:55 +0100
Subject: [PATCH] Polish 62a2e65e204287196719451d1965c4fa0e2cce4a

Add null check for delimiter
---
 .../batch/item/file/builder/FlatFileItemWriterBuilder.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/builder/FlatFileItemWriterBuilder.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/builder/FlatFileItemWriterBuilder.java
index 6081188d3..db7d56228 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/builder/FlatFileItemWriterBuilder.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/builder/FlatFileItemWriterBuilder.java
@@ -463,7 +463,9 @@ public class FlatFileItemWriterBuilder<T> {
 					"A list of field names or a field extractor is required");
 
 			DelimitedLineAggregator<T> delimitedLineAggregator = new DelimitedLineAggregator<>();
-			delimitedLineAggregator.setDelimiter(this.delimiter);
+			if (this.delimiter != null) {
+				delimitedLineAggregator.setDelimiter(this.delimiter);
+			}
 
 			if (this.fieldExtractor == null) {
 				BeanWrapperFieldExtractor<T> beanWrapperFieldExtractor = new BeanWrapperFieldExtractor<>();