Merged in task/dspace-cris-2023_02_x/DSC-1711_Export-process-failing-…

…when-run-twice-on-the-same-item (pull request DSpace#2300)

Ensure work directory is cleaned up whether zip file is created successfully or an error occurs.

Approved-by: Giuseppe Digilio

dspace-api/src/main/java/org/dspace/app/itemexport/ItemExportServiceImpl.java

@@ -490,19 +490,26 @@ public void exportAsZip(Context context, Iterator<Item> items,
 
  File wkDir = new File(workDir);
  if (!wkDir.exists() && !wkDir.mkdirs()) {
- logError("Unable to create working direcory");
+ logError("Unable to create working directory");
  }
 
  File dnDir = new File(destDirName);
  if (!dnDir.exists() && !dnDir.mkdirs()) {
  logError("Unable to create destination directory");
  }
 
- // export the items using normal export method
- exportItem(context, items, workDir, seqStart, migrate, excludeBitstreams);
+ try {
+ // export the items using normal export method (this exports items to our workDir)
+ exportItem(context, items, workDir, seqStart, migrate, excludeBitstreams);
 
- // now zip up the export directory created above
- zip(workDir, destDirName + System.getProperty("file.separator") + zipFileName);
+ // now zip up the workDir directory created above
+ zip(workDir, destDirName + System.getProperty("file.separator") + zipFileName);
+ } finally {
+ // Cleanup workDir created above, if it still exists
+ if (wkDir.exists()) {
+ deleteDirectory(wkDir);
+ }
+ }
  }
 
  @Override