Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module

Conflicts:
	Dozentenmodulserver/bin/server/ServerHandler.class

1 files changed, 2 insertions, 0 deletions

diff --git a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java
index 6d3872a0..8c14fa01 100644
--- a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java
+++ b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java
@@ -405,6 +405,7 @@ public class FTPCreateUploader_GUI extends JFrame implements
 		btnUploadStarten.setText("Bitte warten");
 
 		try {
+			System.out.println("Test");
 			user = client.getFtpUser();
 			System.out.println("FTP name" + user.userName);
 			System.out.println("FTP path" + user.path);
@@ -427,6 +428,7 @@ public class FTPCreateUploader_GUI extends JFrame implements
 				+ person.verantwortlicher.getUsername() + "_"
 				+ Image.image.getImagename() + ".vmdk");
 		System.out.println("Uploading to host: "+host);
+		
 		task = new UploadTask(host, port, user.userName, user.password,
 				user.path+"temp/", uploadFile);