conditionally include separator, addresses issue more properly

Nuix · Feb 7, 2022 · 06919b3 · 06919b3
1 parent 9c33581
commit 06919b3
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/Java/src/main/java/com/nuix/superutilities/misc/ZipHelper.java b/Java/src/main/java/com/nuix/superutilities/misc/ZipHelper.java
@@ -43,11 +43,18 @@ public static void compressDirectoryToZipFile(String directory, String zipFile,
 	 */
 	@SuppressWarnings("deprecation")
 	private static void compressDirectoryToZipfile(String rootDir, String sourceDir, ZipOutputStream out) throws IOException, FileNotFoundException {
-	    for (File file : new File(sourceDir).listFiles()) {
+		for (File file : new File(sourceDir).listFiles()) {
 	        if (file.isDirectory()) {
 	            compressDirectoryToZipfile(rootDir, sourceDir + File.separator + file.getName(), out);
 	        } else {
-	            ZipEntry entry = new ZipEntry(sourceDir.replace(rootDir, "") + File.separator + file.getName());
+	        	String dir = sourceDir.replace(rootDir, "");
+	        	ZipEntry entry;
+	        	if (!dir.trim().isEmpty()) {
+	        		entry = new ZipEntry(dir + File.separator + file.getName());	
+	        	} else {
+	        		entry = new ZipEntry(file.getName());
+	        	}
+
 	            out.putNextEntry(entry);
 	            FileInputStream in = new FileInputStream(sourceDir + File.separator + file.getName());
 	            IOUtils.copy(in, out);