[server] db stuff, new interface, ...

1 files changed, 6 insertions, 5 deletions

diff --git a/dozentenmodulserver/src/main/java/fileserv/FileServer.java b/dozentenmodulserver/src/main/java/fileserv/FileServer.java
index 8322e2e9..e82fa39c 100644
--- a/dozentenmodulserver/src/main/java/fileserv/FileServer.java
+++ b/dozentenmodulserver/src/main/java/fileserv/FileServer.java
@@ -10,12 +10,12 @@ import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 
+import org.openslx.bwlp.thrift.iface.TTransferRejectedException;
+import org.openslx.bwlp.thrift.iface.UserInfo;
 import org.openslx.filetransfer.Downloader;
 import org.openslx.filetransfer.IncomingEvent;
 import org.openslx.filetransfer.Listener;
 import org.openslx.filetransfer.Uploader;
-import org.openslx.imagemaster.thrift.iface.UserInfo;
-import org.openslx.sat.thrift.iface.TUploadRejectedException;
 
 import util.Constants;
 import util.Formatter;
@@ -70,7 +70,7 @@ public class FileServer implements IncomingEvent {
 	}
 
 	public String createNewUserUpload(UserInfo owner, long fileSize, List<ByteBuffer> sha1Sums)
-			throws TUploadRejectedException, FileNotFoundException {
+			throws TTransferRejectedException, FileNotFoundException {
 		Iterator<ActiveUpload> it = uploads.values().iterator();
 		int activeUploads = 0;
 		while (it.hasNext()) {
@@ -84,12 +84,13 @@ public class FileServer implements IncomingEvent {
 			activeUploads++;
 		}
 		if (activeUploads > Constants.MAX_UPLOADS)
-			throw new TUploadRejectedException("Server busy. Too many running uploads.");
+			throw new TTransferRejectedException("Server busy. Too many running uploads.");
 		File destinationFile = null;
 		do {
 			destinationFile = Formatter.getTempImageName();
 		} while (destinationFile.exists());
-		ActiveUpload upload = new ActiveUpload(owner, destinationFile, fileSize, sha1Sums);
+		// TODO: Pass image
+		ActiveUpload upload = new ActiveUpload(owner, null, destinationFile, fileSize, sha1Sums);
 		String key = UUID.randomUUID().toString();
 		uploads.put(key, upload);
 		return key;