• [Client] fixed incorrect JOptionPane

• [Server] fixed bug: server used to delete modified images, even if no new file was uploaded

1 files changed, 10 insertions, 1 deletions

diff --git a/dozentenmodulserver/src/main/java/server/ServerHandler.java b/dozentenmodulserver/src/main/java/server/ServerHandler.java
index 0deb1037..ebba88e1 100644
--- a/dozentenmodulserver/src/main/java/server/ServerHandler.java
+++ b/dozentenmodulserver/src/main/java/server/ServerHandler.java
@@ -475,6 +475,9 @@ public class ServerHandler implements Server.Iface {
 			
 			//get old_image_path
 			String old_image_path = sql.getFile(id, version);
+			//log.debug("old file path has value:"+old_image_path.substring(5));
+			//log.debug("new file path has value:"+image_path.substring(5));
+
 
 			String mode = null;
 
@@ -492,13 +495,19 @@ public class ServerHandler implements Server.Iface {
 			int val = sql.UpdateImageData(name, newName, desc, image_path,
 					license, internet, cpu, ram, id, version, isTemplate,
 					filesize, mode, pk_os);
+			
+			
 
-			if (val == 0) {
+			//check if new file has been uploaded by checking if the new file path equals the old file path
+			//if so, no new file was uploaded. Else delete old file
+			if (val == 0 && (!old_image_path.substring(5).matches(image_path.substring(5))) ) {
 				// update was successful - delete old file
+				//log.debug("deleting file "+old_image_path);
 				deleteImageByPath(old_image_path);
 			} else {
 				// update was not successful - delete new file
 				// TODO not yet implemented
+				//log.debug("doing nothing because no new file was uploaded..");
 
 			}
 		}