From dedd46c7466d2c6752a4de9fd434ae43ca14ea64 Mon Sep 17 00:00:00 2001
From: fkiefer <none@none>
Date: Wed, 1 Feb 2017 15:23:25 +0100
Subject: [PATCH] OO-2454 Upgrader 11_3_0 fixes 2
---
.../modules/video/manager/VideoManagerImpl.java | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)
diff --git a/src/main/java/org/olat/modules/video/manager/VideoManagerImpl.java b/src/main/java/org/olat/modules/video/manager/VideoManagerImpl.java
index 4af421c20d3..c7386bec406 100644
--- a/src/main/java/org/olat/modules/video/manager/VideoManagerImpl.java
+++ b/src/main/java/org/olat/modules/video/manager/VideoManagerImpl.java
@@ -523,7 +523,7 @@ public class VideoManagerImpl implements VideoManager {
public boolean hasMasterContainer (OLATResource videoResource) {
VFSContainer baseContainer = FileResourceManager.getInstance().getFileResourceRootImpl(videoResource);
VFSContainer masterContainer = (VFSContainer) baseContainer.resolve(DIRNAME_MASTER);
- return masterContainer != null;
+ return masterContainer != null & masterContainer.exists();
}
@Override
@@ -875,16 +875,9 @@ public class VideoManagerImpl implements VideoManager {
@Override
public boolean hasVideoFile(OLATResource videoResource) {
- try {
- if (getVideoFile(videoResource) == null) {
- return false;
- } else {
- return true;
- }
- } catch (Exception e) {
- log.error("",e);
- return false;
- }
+ VFSContainer masterContainer = getMasterContainer(videoResource);
+ LocalFileImpl videoFile = (LocalFileImpl) masterContainer.resolve(FILENAME_VIDEO_MP4);
+ return videoFile != null & videoFile.exists();
}
}
--
GitLab