From d8e8dbe25b6522d3f03c8b8c08841e1b0a6bbe7d Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 24 Jul 2015 19:06:50 +0200
Subject: [client] Fix upload wizard state checks, fix formatting [server]
 Handle null tokens in FileServer

---
 .../src/main/java/org/openslx/bwlp/sat/fileserv/FileServer.java     | 2 ++
 .../src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java    | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'dozentenmodulserver/src/main/java/org')

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);
 	}
 
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java
index 0c26081b..b835ded9 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java
@@ -78,7 +78,11 @@ public class ServerHandler implements SatelliteServer.Iface {
 		} catch (SQLException e) {
 			throw new TInternalServerError();
 		}
-		byte[] mDesc = machineDescription == null ? null : machineDescription.array();
+		byte[] mDesc = null;
+		if (machineDescription != null) {
+			mDesc = new byte[machineDescription.remaining()];
+			machineDescription.get(mDesc);
+		}
 		ActiveUpload transfer = fileServer.createNewUserUpload(user, image, fileSize, blockHashes, mDesc);
 		return new TransferInformation(transfer.getId(), fileServer.getPlainPort(), fileServer.getSslPort());
 	}
-- 
cgit v1.2.3-55-g7522