hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-07 01:54:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

[CST-5699] fix duplicate separator on working directories

Browse Source
This commit is contained in:
Francesco Pio Scognamiglio
2022-09-27 15:04:49 +02:00
parent 430a0f0eb3
commit 1b4f1cb49c
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -788,7 +788,8 @@ public class ItemExportServiceImpl implements ItemExportService {
throw new Exception( throw new Exception(
"A dspace.cfg entry for 'org.dspace.app.itemexport.work.dir' does not exist."); "A dspace.cfg entry for 'org.dspace.app.itemexport.work.dir' does not exist.");
} }
return exportDir; // clean work dir path from duplicate separators
return StringUtils.replace(exportDir, File.separator + File.separator, File.separator);
} }
@Override @Override
@@ -1050,8 +1051,11 @@ public class ItemExportServiceImpl implements ItemExportService {
return; return;
} }
String strAbsPath = cpFile.getPath(); String strAbsPath = cpFile.getPath();
String strZipEntryName = strAbsPath.substring(strSource int startIndex = strSource.length();
.length(), strAbsPath.length()); if (!StringUtils.endsWith(strSource, File.separator)) {
startIndex++;
}
String strZipEntryName = strAbsPath.substring(startIndex, strAbsPath.length());
// byte[] b = new byte[ (int)(cpFile.length()) ]; // byte[] b = new byte[ (int)(cpFile.length()) ];

2
dspace-api/src/main/java/org/dspace/app/itemimport/ItemImportServiceImpl.java
View File

@@ -202,6 +202,8 @@ public class ItemImportServiceImpl implements ItemImportService, InitializingBea
logError("Cannot create batch import directory! " + tempWorkDir); logError("Cannot create batch import directory! " + tempWorkDir);
} }
} }
// clean work dir path from duplicate separators
tempWorkDir = StringUtils.replace(tempWorkDir, File.separator + File.separator, File.separator);
} }
// File listing filter to look for metadata files // File listing filter to look for metadata files