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

Conflicts:
	Dozentenmodul/src/GUI/SearchImage_GUI.java
	Dozentenmodul/src/Models/person.java
	Dozentenmodul/src/Models/vm.java

1 files changed, 7 insertions, 3 deletions

diff --git a/Dozentenmodul/src/ftp/FTPUtility.java b/Dozentenmodul/src/ftp/FTPUtility.java
index c62ba07d..7824440a 100644
--- a/Dozentenmodul/src/ftp/FTPUtility.java
+++ b/Dozentenmodul/src/ftp/FTPUtility.java
@@ -6,6 +6,9 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.SocketException;
 import java.security.NoSuchAlgorithmException;
+
+import models.Image;
+
 import org.apache.commons.net.ftp.FTP;
 import org.apache.commons.net.ftp.FTPFile;
 import org.apache.commons.net.ftp.FTPReply;
@@ -138,9 +141,10 @@ public class FTPUtility {
             if (!success) {
                 throw new FTPException("Could not set binary file type.");
             }
-             
-            outputStream = ftpClient.storeFileStream(uploadFile.getName());
-           // ftpClient.rename(uploadFile.getName(), vm.vl.getLaborname());
+            
+            outputStream = ftpClient.storeFileStream(Image.image.getNewName());
+            
+            //ftpClient.rename(uploadFile.getName(), );
         } catch (IOException ex) {
             throw new FTPException("Error uploading file: " + ex.getMessage());
         }