From f809e774b59107eb29aae868290735a751cd9034 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Mon, 27 Jun 2016 12:04:48 +0200
Subject: [PATCH] OO-2076: fix NPE if the fileName is null
---
src/main/java/org/olat/core/util/SortedProperties.java | 4 ++--
src/main/java/org/olat/repository/handlers/VideoHandler.java | 4 +++-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/olat/core/util/SortedProperties.java b/src/main/java/org/olat/core/util/SortedProperties.java
index b1ab31c6c8c..d68b21da89d 100644
--- a/src/main/java/org/olat/core/util/SortedProperties.java
+++ b/src/main/java/org/olat/core/util/SortedProperties.java
@@ -56,12 +56,12 @@ public class SortedProperties extends Properties {
*
* @see java.util.Hashtable#keys()
*/
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({ "unchecked", "cast" })
@Override
public synchronized Enumeration<Object> keys() {
// sort elements based on detector (prop key) names
Set set = keySet();
- return sortKeys(set);
+ return (Enumeration<Object>)sortKeys(set);
}
/**
diff --git a/src/main/java/org/olat/repository/handlers/VideoHandler.java b/src/main/java/org/olat/repository/handlers/VideoHandler.java
index b3ae4850699..da84c074cd4 100644
--- a/src/main/java/org/olat/repository/handlers/VideoHandler.java
+++ b/src/main/java/org/olat/repository/handlers/VideoHandler.java
@@ -122,7 +122,9 @@ public class VideoHandler extends FileHandler {
displayname, description, resource, RepositoryEntry.ACC_OWNERS);
DBFactory.getInstance().commit();
-
+ if(fileName == null) {
+ fileName = file.getName();
+ }
fileName = fileName.toLowerCase();
VFSLeaf importFile = new LocalFileImpl(file);
VideoManager videoManager = CoreSpringFactory.getImpl(VideoManager.class);
--
GitLab