From 8c347877d97714e7888616f2639bb76bba3fddc9 Mon Sep 17 00:00:00 2001
From: Jorge <jagedn@gmail.com>
Date: Mon, 23 Oct 2017 23:32:57 +0200
Subject: [PATCH] ZipTransformer: Use FILENAME header if specified

If FILENAME is present at headers we must use this value as the name
of zip file without conversion
---
 .../integration/zip/transformer/ZipTransformer.java             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-integration-zip/src/main/java/org/springframework/integration/zip/transformer/ZipTransformer.java b/spring-integration-zip/src/main/java/org/springframework/integration/zip/transformer/ZipTransformer.java
index b0f3545..71aa473 100644
--- a/spring-integration-zip/src/main/java/org/springframework/integration/zip/transformer/ZipTransformer.java
+++ b/spring-integration-zip/src/main/java/org/springframework/integration/zip/transformer/ZipTransformer.java
@@ -113,7 +113,7 @@ public class ZipTransformer extends AbstractZipTransformer {
 		}
 
 		if (message.getHeaders().containsKey(FileHeaders.FILENAME)) {
-			zipFileName = baseFileName;
+			zipFileName = (String) message.getHeaders().get(FileHeaders.FILENAME);
 		}
 		else {
 			zipFileName = baseFileName + ZIP_EXTENSION;