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

DS-1754 Use canonical not absolute path

Browse Source 
Using the canonical path when determining the location of the undo information
leads to consistent behaviour when using "." as the source vs using eg an
absolute path. This also adds the name of the directory to the error message in
case the directory cannot be created, to help with troubleshooting.
This commit is contained in:
Andrea Schweer
2013-11-05 12:30:01 +13:00
parent e16b9b4f12
commit 66414dda73
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dspace-api/src/main/java/org/dspace/app/itemupdate/ItemUpdate.java
View File

@@ -515,7 +515,7 @@ public class ItemUpdate {
private File initUndoArchive(File sourceDir)
throws FileNotFoundException, IOException
{
File parentDir = sourceDir.getAbsoluteFile().getParentFile();
File parentDir = sourceDir.getCanonicalFile().getParentFile();
if (parentDir == null)
{
throw new FileNotFoundException("Parent directory of archive directory not found; unable to write UndoArchive; no processing performed");
@@ -533,8 +533,8 @@ public class ItemUpdate {
// create root directory
if (!undoDir.mkdir())
{
pr("ERROR creating Undo Archive directory ");
throw new IOException("ERROR creating Undo Archive directory ");
pr("ERROR creating Undo Archive directory " + undoDir.getCanonicalPath());
throw new IOException("ERROR creating Undo Archive directory " + undoDir.getCanonicalPath());
}
//Undo is suppressed to prevent undo of undo