OO-2454 Upgrader 11_3_0 fixes 4

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;
 	}
 	

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;
 		}
 	}
 	

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);