Skip to content
Snippets Groups Projects
Commit 0d844f3f authored by srosse's avatar srosse
Browse files

Merge OpenOLAT 10.5 to OpenOLAT default branch with bf34657d7417d30354e70da51905fd1cce7b6eb9

parents 59c69bd6 f809e774
No related branches found
No related tags found
No related merge requests found
...@@ -82,7 +82,8 @@ public class WebDAVAuthManager implements AuthenticationSPI { ...@@ -82,7 +82,8 @@ public class WebDAVAuthManager implements AuthenticationSPI {
Identity identity = olatAuth.getIdentity(); Identity identity = olatAuth.getIdentity();
return identity; return identity;
} else { } else {
log.error("Verity doesn't equals response"); // don't log as error, happens all the time with certain clients, e.g. Microsoft-WebDAV-MiniRedir
log.debug("Verity::" + verity + " doesn't equals response::" + response);
} }
} }
} }
......
...@@ -56,12 +56,12 @@ public class SortedProperties extends Properties { ...@@ -56,12 +56,12 @@ public class SortedProperties extends Properties {
* *
* @see java.util.Hashtable#keys() * @see java.util.Hashtable#keys()
*/ */
@SuppressWarnings("unchecked") @SuppressWarnings({ "unchecked", "cast" })
@Override @Override
public synchronized Enumeration<Object> keys() { public synchronized Enumeration<Object> keys() {
// sort elements based on detector (prop key) names // sort elements based on detector (prop key) names
Set set = keySet(); Set set = keySet();
return sortKeys(set); return (Enumeration<Object>)sortKeys(set);
} }
/** /**
......
...@@ -122,7 +122,9 @@ public class VideoHandler extends FileHandler { ...@@ -122,7 +122,9 @@ public class VideoHandler extends FileHandler {
displayname, description, resource, RepositoryEntry.ACC_OWNERS); displayname, description, resource, RepositoryEntry.ACC_OWNERS);
DBFactory.getInstance().commit(); DBFactory.getInstance().commit();
if(fileName == null) {
fileName = file.getName();
}
fileName = fileName.toLowerCase(); fileName = fileName.toLowerCase();
VFSLeaf importFile = new LocalFileImpl(file); VFSLeaf importFile = new LocalFileImpl(file);
VideoManager videoManager = CoreSpringFactory.getImpl(VideoManager.class); VideoManager videoManager = CoreSpringFactory.getImpl(VideoManager.class);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment