INT-4237: FWMH: Acquire Lock Before Flushing

JIRA: https://jira.spring.io/browse/INT-4237

It was possible to flush (close) the file while a write was in process; more likely when
`flushWhenIdle` is false.

This probably would not occur in the real world, just tests with short flush intervals,
but certainly possible.

There is already a lock used to prevent concurrent writes while appending; use the same
lock when flushing.

Conflicts:
	spring-integration-file/src/main/java/org/springframework/integration/file/FileWritingMessageHandler.java
	spring-integration-file/src/test/java/org/springframework/integration/file/FileWritingMessageHandlerTests.java

spring-integration-core/src/main/java/org/springframework/integration/util/WhileLockedProcessor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,13 +34,16 @@ import org.springframework.messaging.MessagingException;
  *
  */
 public abstract class WhileLockedProcessor {
+
 	private final Object key;
+
 	private final LockRegistry lockRegistry;
 
 	public WhileLockedProcessor(LockRegistry lockRegistry,  Object key) {
 		this.key = key;
 		this.lockRegistry = lockRegistry;
 	}
+
 	public final void doWhileLocked() throws IOException {
 		Lock lock = this.lockRegistry.obtain(this.key);
 		try {
@@ -65,4 +68,5 @@ public abstract class WhileLockedProcessor {
 	 * @throws IOException Any IOException.
 	 */
 	protected abstract void whileLocked() throws IOException;
+
 }

spring-integration-file/src/main/java/org/springframework/integration/file/FileWritingMessageHandler.java

@@ -34,6 +34,7 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.locks.Lock;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -810,10 +811,12 @@ public class FileWritingMessageHandler extends AbstractReplyProducingMessageHand
 			}
 			if (state == null) {
 				if (isString) {
-					state = new FileState(createWriter(fileToWriteTo, true));
+					state = new FileState(createWriter(fileToWriteTo, true),
+							this.lockRegistry.obtain(fileToWriteTo.getAbsolutePath()));
 				}
 				else {
-					state = new FileState(createOutputStream(fileToWriteTo, true));
+					state = new FileState(createOutputStream(fileToWriteTo, true),
+							this.lockRegistry.obtain(fileToWriteTo.getAbsolutePath()));
 				}
 				this.fileStates.put(absolutePath, state);
 			}
@@ -825,12 +828,27 @@ public class FileWritingMessageHandler extends AbstractReplyProducingMessageHand
 		return state;
 	}
 
-	private BufferedWriter createWriter(final File fileToWriteTo, final boolean append) throws FileNotFoundException {
+	/**
+	 * Create a buffered writer for the file, for String payloads.
+	 * @param fileToWriteTo the file.
+	 * @param append true if we are appending.
+	 * @return the writer.
+	 * @throws FileNotFoundException if the file does not exist.
+	 * @since 4.3.8
+	 */
+	protected BufferedWriter createWriter(final File fileToWriteTo, final boolean append) throws FileNotFoundException {
 		return new BufferedWriter(new OutputStreamWriter(new FileOutputStream(fileToWriteTo, append), this.charset),
 				this.bufferSize);
 	}
 
-	private BufferedOutputStream createOutputStream(File fileToWriteTo, final boolean append)
+	/**
+	 * Create a buffered output stream for the file.
+	 * @param fileToWriteTo the file.
+	 * @param append true if we are appending.
+	 * @return the stream.
+	 * @since 4.3.8
+	 */
+	protected BufferedOutputStream createOutputStream(File fileToWriteTo, final boolean append)
 			throws FileNotFoundException {
 		return new BufferedOutputStream(new FileOutputStream(fileToWriteTo, append), this.bufferSize);
 	}
@@ -911,31 +929,44 @@ public class FileWritingMessageHandler extends AbstractReplyProducingMessageHand
 
 		private final BufferedOutputStream  stream;
 
+		private final Lock lock;
+
 		private final long firstWrite = System.currentTimeMillis();
 
 		private volatile long lastWrite;
 
-		private FileState(BufferedWriter writer) {
+		FileState(BufferedWriter writer, Lock lock) {
 			this.writer = writer;
 			this.stream = null;
+			this.lock = lock;
 		}
 
-		private FileState(BufferedOutputStream stream) {
+		FileState(BufferedOutputStream stream, Lock lock) {
 			this.writer = null;
 			this.stream = stream;
+			this.lock = lock;
 		}
 
 		private void close() {
 			try {
-				if (this.writer != null) {
-					this.writer.close();
+				this.lock.lockInterruptibly();
+				try {
+					if (this.writer != null) {
+						this.writer.close();
+					}
+					else {
+						this.stream.close();
+					}
 				}
-				else {
-					this.stream.close();
+				catch (IOException e) {
+					// ignore
 				}
 			}
-			catch (IOException e) {
-				// ignore
+			catch (InterruptedException e1) {
+				Thread.currentThread().interrupt();
+			}
+			finally {
+				this.lock.unlock();
 			}
 		}
 	}

spring-integration-file/src/test/java/org/springframework/integration/file/FileWritingMessageHandlerTests.java

@@ -29,12 +29,17 @@ import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
+import static org.mockito.BDDMockito.willAnswer;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.anyInt;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.startsWith;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import java.io.BufferedOutputStream;
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileInputStream;
@@ -46,6 +51,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.regex.Matcher;
 
+import org.apache.commons.io.output.ByteArrayOutputStream;
 import org.apache.commons.logging.Log;
 import org.junit.Before;
 import org.junit.Ignore;
@@ -542,6 +548,49 @@ public class FileWritingMessageHandlerTests {
 		handler.stop();
 	}
 
+	@Test
+	public void lockForFlush() throws Exception {
+		File tempFolder = this.temp.newFolder();
+		ByteArrayOutputStream baos = new ByteArrayOutputStream();
+		final BufferedOutputStream out = spy(new BufferedOutputStream(baos));
+		FileWritingMessageHandler handler = new FileWritingMessageHandler(tempFolder) {
+
+			@Override
+			protected BufferedOutputStream createOutputStream(File fileToWriteTo, boolean append) {
+				return out;
+			}
+
+		};
+		handler.setFileExistsMode(FileExistsMode.APPEND_NO_FLUSH);
+		handler.setFileNameGenerator(message -> "foo.txt");
+		ThreadPoolTaskScheduler taskScheduler = new ThreadPoolTaskScheduler();
+		taskScheduler.afterPropertiesSet();
+		handler.setTaskScheduler(taskScheduler);
+		handler.setOutputChannel(new NullChannel());
+		handler.setBeanFactory(mock(BeanFactory.class));
+		handler.setFlushInterval(10);
+		handler.setFlushWhenIdle(false);
+		handler.afterPropertiesSet();
+		handler.start();
+
+		final AtomicBoolean writing = new AtomicBoolean();
+		final AtomicBoolean closeWhileWriting = new AtomicBoolean();
+		willAnswer(i -> {
+			writing.set(true);
+			Thread.sleep(500);
+			writing.set(false);
+			return null;
+		}).given(out).write(any(byte[].class), anyInt(), anyInt());
+		willAnswer(i -> {
+			closeWhileWriting.compareAndSet(false, writing.get());
+			return null;
+		}).given(out).close();
+		handler.handleMessage(new GenericMessage<>("foo".getBytes()));
+		verify(out).write(any(byte[].class), anyInt(), anyInt());
+		assertFalse(closeWhileWriting.get());
+		handler.stop();
+	}
+
 	void assertFileContentIsMatching(Message<?> result) throws IOException {
 		assertFileContentIs(result, SAMPLE_CONTENT);
 	}