FD-7423. Fix upload zip with backslashes (IQSS#174)

* FD-7423. Fix upload zip with backslashes * Fix upload zip with backslashes
janvanmansum · Aug 22, 2023 · bdee5fc · bdee5fc
1 parent 5834c05
commit bdee5fc
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/FileUtil.java b/src/main/java/edu/harvard/iq/dataverse/util/FileUtil.java
@@ -984,7 +984,7 @@ public static CreateDataFileResult createDataFiles(DatasetVersion version, Input
                         ZipEntry entry = entries.nextElement();
                         logger.fine("inside first zip pass; this entry: "+entry.getName());
                         if (!entry.isDirectory()) {
-                            String shortName = entry.getName().replaceFirst("^.*[\\/]", "");
+                            String shortName = entry.getName().replaceFirst("^.*[\\\\/]", "");
                             // ... and, finally, check if it's a "fake" file - a zip archive entry
                             // created for a MacOS X filesystem element: (these
                             // start with "._") 
@@ -1055,7 +1055,7 @@ public static CreateDataFileResult createDataFiles(DatasetVersion version, Input
 
                             if (fileEntryName != null && !fileEntryName.equals("")) {
 
-                                String shortName = fileEntryName.replaceFirst("^.*[\\/]", "");
+                                String shortName = fileEntryName.replaceFirst("^.*[\\\\/]", "");
 
                                 // Check if it's a "fake" file - a zip archive entry
                                 // created for a MacOS X filesystem element: (these