summaryrefslogtreecommitdiffstats
path: root/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/FileServer.java
diff options
context:
space:
mode:
authorSimon Rettberg2015-07-24 19:06:50 +0200
committerSimon Rettberg2015-07-24 19:06:50 +0200
commitd8e8dbe25b6522d3f03c8b8c08841e1b0a6bbe7d (patch)
tree6d03021cb939ea4374d3b228cb0cfd9be44368b3 /dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/FileServer.java
parent[client] fix invocation exception (diff)
downloadtutor-module-d8e8dbe25b6522d3f03c8b8c08841e1b0a6bbe7d.tar.gz
tutor-module-d8e8dbe25b6522d3f03c8b8c08841e1b0a6bbe7d.tar.xz
tutor-module-d8e8dbe25b6522d3f03c8b8c08841e1b0a6bbe7d.zip
[client] Fix upload wizard state checks, fix formatting
[server] Handle null tokens in FileServer
Diffstat (limited to 'dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/FileServer.java')
-rw-r--r--dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/FileServer.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/FileServer.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/FileServer.java
index 9895e655..16369745 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/FileServer.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/FileServer.java
@@ -84,6 +84,8 @@ public class FileServer implements IncomingEvent {
* @return
*/
public ActiveUpload getUploadByToken(String uploadToken) {
+ if (uploadToken == null)
+ return null;
return uploads.get(uploadToken);
}