Skip to content
Snippets Groups Projects
Commit 9a24f14c authored by srosse's avatar srosse
Browse files

OO-4012: don't try to delete meta info which doesn't exists

parent 41569771
No related branches found
No related tags found
No related merge requests found
...@@ -42,6 +42,7 @@ import org.olat.core.commons.modules.bc.FolderConfig; ...@@ -42,6 +42,7 @@ import org.olat.core.commons.modules.bc.FolderConfig;
import org.olat.core.logging.AssertException; import org.olat.core.logging.AssertException;
import org.olat.core.logging.OLog; import org.olat.core.logging.OLog;
import org.olat.core.logging.Tracing; import org.olat.core.logging.Tracing;
import org.olat.core.util.vfs.meta.MetaInfo;
import org.olat.core.util.vfs.version.Versionable; import org.olat.core.util.vfs.version.Versionable;
import org.olat.core.util.vfs.version.Versions; import org.olat.core.util.vfs.version.Versions;
import org.olat.core.util.vfs.version.VersionsManager; import org.olat.core.util.vfs.version.VersionsManager;
...@@ -162,7 +163,10 @@ public class LocalFileImpl extends LocalImpl implements VFSLeaf, Versionable { ...@@ -162,7 +163,10 @@ public class LocalFileImpl extends LocalImpl implements VFSLeaf, Versionable {
} }
// Versioning makes a copy of the metadata, delete metadata after it // Versioning makes a copy of the metadata, delete metadata after it
if(canMeta() == VFSConstants.YES) { if(canMeta() == VFSConstants.YES) {
getMetaInfo().delete(); MetaInfo meta = getMetaInfo();
if(meta != null) {// Meta can be null if the file is already deleted
meta.delete();
}
} }
return deleteBasefile(); return deleteBasefile();
} }
...@@ -170,7 +174,10 @@ public class LocalFileImpl extends LocalImpl implements VFSLeaf, Versionable { ...@@ -170,7 +174,10 @@ public class LocalFileImpl extends LocalImpl implements VFSLeaf, Versionable {
@Override @Override
public VFSStatus deleteSilently() { public VFSStatus deleteSilently() {
if(canMeta() == VFSConstants.YES) { if(canMeta() == VFSConstants.YES) {
getMetaInfo().delete(); MetaInfo meta = getMetaInfo();
if(meta != null) {
meta.delete();
}
} }
CoreSpringFactory.getImpl(VersionsManager.class).delete(this, true); CoreSpringFactory.getImpl(VersionsManager.class).delete(this, true);
return deleteBasefile(); return deleteBasefile();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment