From 48c678bd4b65c46b1fa06a5927e1a7da42ee9f77 Mon Sep 17 00:00:00 2001
From: fkiefer <none@none>
Date: Mon, 14 Nov 2016 17:21:56 +0100
Subject: [PATCH] OO-2361 bugfix VideoAdminTranscodingController
---
.../modules/video/ui/VideoAdminTranscodingController.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/olat/modules/video/ui/VideoAdminTranscodingController.java b/src/main/java/org/olat/modules/video/ui/VideoAdminTranscodingController.java
index 2f33da55c7e..ee4a6d846fb 100644
--- a/src/main/java/org/olat/modules/video/ui/VideoAdminTranscodingController.java
+++ b/src/main/java/org/olat/modules/video/ui/VideoAdminTranscodingController.java
@@ -167,9 +167,11 @@ public class VideoAdminTranscodingController extends FormBasicController {
List<VideoTranscoding> transcodings = videoManager.getVideoTranscodings(videoResource);
//map resource IDs to resolution
for (VideoTranscoding videoTranscoding : transcodings) {
- if (videoTranscoding.getStatus() != -1 || true) {
- availableTranscodings.get(videoTranscoding.getResolution())
- .add(videoTranscoding.getVideoResource().getKey());
+ if (videoTranscoding != null && videoTranscoding.getStatus() != -1) {
+ Set<Long> oneResolution = availableTranscodings.get(videoTranscoding.getResolution());
+ if (oneResolution != null) {
+ oneResolution.add(videoTranscoding.getVideoResource().getKey());
+ }
}
}
}
--
GitLab