From 65a47ff605c012cc00c64853eda52579b6c0b8f7 Mon Sep 17 00:00:00 2001
From: fkiefer <none@none>
Date: Tue, 28 Feb 2017 10:58:30 +0100
Subject: [PATCH] OO-2454 Upgrader 11_3_0 fixes 4
---
.../org/olat/modules/video/manager/VideoManagerImpl.java | 8 ++++++++
.../org/olat/modules/video/manager/VideoMetadataDAO.java | 2 +-
src/main/java/org/olat/upgrade/OLATUpgrade_11_3_0.java | 2 +-
3 files changed, 10 insertions(+), 2 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 69ea6cdf0ac..4599de7e460 100644
--- a/src/main/java/org/olat/modules/video/manager/VideoManagerImpl.java
+++ b/src/main/java/org/olat/modules/video/manager/VideoManagerImpl.java
@@ -857,9 +857,17 @@ public class VideoManagerImpl implements VideoManager {
return metadata;
}
+ @Override
+ public boolean hasVideoMetadata(OLATResource videoResource) {
+ return videoMetadataDao.getVideoMetadata(videoResource) != null;
+ }
+
@Override
public VideoMetaImpl getVideoMetadata(OLATResource videoResource) {
VideoMetaImpl meta = videoMetadataDao.getVideoMetadata(videoResource);
+ if (meta == null) {
+ return new VideoMetaImpl(800, 600, 5000);
+ }
return meta;
}
diff --git a/src/main/java/org/olat/modules/video/manager/VideoMetadataDAO.java b/src/main/java/org/olat/modules/video/manager/VideoMetadataDAO.java
index 27c829d2919..992d757d8a7 100644
--- a/src/main/java/org/olat/modules/video/manager/VideoMetadataDAO.java
+++ b/src/main/java/org/olat/modules/video/manager/VideoMetadataDAO.java
@@ -66,7 +66,7 @@ public class VideoMetadataDAO {
if (metadata.size() > 0) {
return metadata.get(0);
} else {
- return new VideoMetaImpl(800, 600, 5000);
+ return null;
}
}
diff --git a/src/main/java/org/olat/upgrade/OLATUpgrade_11_3_0.java b/src/main/java/org/olat/upgrade/OLATUpgrade_11_3_0.java
index f3b5ad18909..d8b93275d5e 100644
--- a/src/main/java/org/olat/upgrade/OLATUpgrade_11_3_0.java
+++ b/src/main/java/org/olat/upgrade/OLATUpgrade_11_3_0.java
@@ -144,7 +144,7 @@ public class OLATUpgrade_11_3_0 extends OLATUpgrade {
String fileName = videoFile.getName();
long size = videoFile.length();
String format = FilenameUtils.getExtension(fileName);
- if (videoManager.getVideoMetadata(videoResource) == null) {
+ if (videoManager.hasVideoMetadata(videoResource)) {
VideoMetaImpl entity = new VideoMetaImpl();
entity.setVideoResource(videoResource);
entity.setFormat(format);
--
GitLab