From a1a3c2a1ac89dd5b898b9e7841b860ff4df37cf5 Mon Sep 17 00:00:00 2001
From: Artem Bilan <abilan@pivotal.io>
Date: Mon, 24 Oct 2016 13:38:38 -0400
Subject: [PATCH] INT-4146: FileWriteMH: protect for OutStr errors

JIRA: https://jira.spring.io/browse/INT-4146
Fixes GH-1942 (https://github.com/spring-projects/spring-integration/issues/1942)

Previously the `FileWritingMessageHandler` didn't wrap `new OutputStream()` to the `try...catch...finally` block, therefore any errors on that (e.g. `FileNotFoundException` because of permissions) cause an early exist without `inputStream.close()`

* Move a `new OutputStream()` to the `try...catch`
* Change `destinationDirectory.canWrite()` to the `Files.isWritable(destinationDirectory.toPath())` because the first one doesn't work on Windows

**Cherry-pick to 4.3.x and 4.2.x but without Files.isWritable() change**
---
 .../file/FileWritingMessageHandler.java       | 31 +++++++++++++------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/FileWritingMessageHandler.java b/spring-integration-file/src/main/java/org/springframework/integration/file/FileWritingMessageHandler.java
index 25911600b6..eaaa2d3b8d 100644
--- a/spring-integration-file/src/main/java/org/springframework/integration/file/FileWritingMessageHandler.java
+++ b/spring-integration-file/src/main/java/org/springframework/integration/file/FileWritingMessageHandler.java
@@ -394,7 +394,7 @@ public class FileWritingMessageHandler extends AbstractReplyProducingMessageHand
 				"Destination directory [" + destinationDirectory + "] does not exist.");
 		Assert.isTrue(destinationDirectory.isDirectory(),
 				"Destination path [" + destinationDirectory + "] does not point to a directory.");
-		Assert.isTrue(destinationDirectory.canWrite(),
+		Assert.isTrue(Files.isWritable(destinationDirectory.toPath()),
 				"Destination directory [" + destinationDirectory + "] is not writable.");
 	}
 
@@ -524,8 +524,9 @@ public class FileWritingMessageHandler extends AbstractReplyProducingMessageHand
 
 				@Override
 				protected void whileLocked() throws IOException {
-					BufferedOutputStream bos = state != null ? state.stream : createOutputStream(fileToWriteTo, true);
+					BufferedOutputStream bos = null;
 					try {
+						bos = state != null ? state.stream : createOutputStream(fileToWriteTo, true);
 						byte[] buffer = new byte[StreamUtils.BUFFER_SIZE];
 						int bytesRead = -1;
 						while ((bytesRead = sourceFileInputStream.read(buffer)) != -1) {
@@ -543,7 +544,9 @@ public class FileWritingMessageHandler extends AbstractReplyProducingMessageHand
 						}
 						try {
 							if (state == null || FileWritingMessageHandler.this.flushTask == null) {
-								bos.close();
+								if (bos != null) {
+									bos.close();
+								}
 								clearState(fileToWriteTo, state);
 							}
 							else {
@@ -562,9 +565,9 @@ public class FileWritingMessageHandler extends AbstractReplyProducingMessageHand
 		}
 		else {
 
-			BufferedOutputStream bos = new BufferedOutputStream(new FileOutputStream(tempFile), this.bufferSize);
-
+			BufferedOutputStream bos = null;
 			try {
+				bos = new BufferedOutputStream(new FileOutputStream(tempFile), this.bufferSize);
 				byte[] buffer = new byte[StreamUtils.BUFFER_SIZE];
 				int bytesRead = -1;
 				while ((bytesRead = sourceFileInputStream.read(buffer)) != -1) {
@@ -582,7 +585,9 @@ public class FileWritingMessageHandler extends AbstractReplyProducingMessageHand
 				catch (IOException ex) {
 				}
 				try {
-					bos.close();
+					if (bos != null) {
+						bos.close();
+					}
 				}
 				catch (IOException ex) {
 				}
@@ -605,8 +610,9 @@ public class FileWritingMessageHandler extends AbstractReplyProducingMessageHand
 
 			@Override
 			protected void whileLocked() throws IOException {
-				BufferedOutputStream bos = state != null ? state.stream : createOutputStream(fileToWriteTo, append);
+				BufferedOutputStream bos = null;
 				try {
+					bos = state != null ? state.stream : createOutputStream(fileToWriteTo, append);
 					bos.write(bytes);
 					if (FileWritingMessageHandler.this.appendNewLine) {
 						bos.write(LINE_SEPARATOR.getBytes());
@@ -615,7 +621,9 @@ public class FileWritingMessageHandler extends AbstractReplyProducingMessageHand
 				finally {
 					try {
 						if (state == null || FileWritingMessageHandler.this.flushTask == null) {
-							bos.close();
+							if (bos != null) {
+								bos.close();
+							}
 							clearState(fileToWriteTo, state);
 						}
 						else {
@@ -646,8 +654,9 @@ public class FileWritingMessageHandler extends AbstractReplyProducingMessageHand
 
 			@Override
 			protected void whileLocked() throws IOException {
-				BufferedWriter writer = state != null ? state.writer : createWriter(fileToWriteTo, append);
+				BufferedWriter writer = null;
 				try {
+					writer = state != null ? state.writer : createWriter(fileToWriteTo, append);
 					writer.write(content);
 					if (FileWritingMessageHandler.this.appendNewLine) {
 						writer.newLine();
@@ -656,7 +665,9 @@ public class FileWritingMessageHandler extends AbstractReplyProducingMessageHand
 				finally {
 					try {
 						if (state == null || FileWritingMessageHandler.this.flushTask == null) {
-							writer.close();
+							if (writer != null) {
+								writer.close();
+							}
 							clearState(fileToWriteTo, state);
 						}
 						else {