Download of study via the UI leads to java.util.zip.ZipException: dup…

…licate entry: DICOM/ fix #3101
dcm4che · Mar 24, 2021 · 5c91237 · 5c91237
1 parent 6cffbff
commit 5c91237
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/dcm4chee-arc-wado/src/main/java/org/dcm4chee/arc/wado/WadoRS.java b/dcm4chee-arc-wado/src/main/java/org/dcm4chee/arc/wado/WadoRS.java
@@ -1330,12 +1330,15 @@ private Object writeZIP(RetrieveContext ctx) {
         };
     }
 
-    private void addDirEntries(ZipOutputStream zip, String name, Set<String> added) throws IOException {
+    private static void addDirEntries(ZipOutputStream zip, String name, Set<String> added) throws IOException {
         int endIndex = 0;
         int i;
         while ((i = name.indexOf('/', endIndex)) >= 0) {
-            zip.putNextEntry(new ZipEntry(name.substring(0, endIndex = (i + 1))));
-            zip.closeEntry();
+            String entry = name.substring(0, endIndex = (i + 1));
+            if (added.add(entry)) {
+                zip.putNextEntry(new ZipEntry(entry));
+                zip.closeEntry();
+            }
         }
     }