summaryrefslogtreecommitdiffstats
path: root/src/main/java/org/openslx/imagemaster/db
diff options
context:
space:
mode:
authorNils Schwabe2014-04-25 16:20:50 +0200
committerNils Schwabe2014-04-25 16:20:50 +0200
commitb9878eda35e354d16ce732a57b7fabebb46c1a46 (patch)
treec0d9c7ad51025affb1480e676f3f37841c3bcd7b /src/main/java/org/openslx/imagemaster/db
parentMerge branch 'master' of git.openslx.org:bwlp/masterserver (diff)
downloadmasterserver-b9878eda35e354d16ce732a57b7fabebb46c1a46.tar.gz
masterserver-b9878eda35e354d16ce732a57b7fabebb46c1a46.tar.xz
masterserver-b9878eda35e354d16ce732a57b7fabebb46c1a46.zip
Add remove image from process list (when user gets deleted after timeout)
Fix problems with timeout user deleting
Diffstat (limited to 'src/main/java/org/openslx/imagemaster/db')
-rw-r--r--src/main/java/org/openslx/imagemaster/db/DbImage.java5
-rw-r--r--src/main/java/org/openslx/imagemaster/db/MySQL.java1
2 files changed, 6 insertions, 0 deletions
diff --git a/src/main/java/org/openslx/imagemaster/db/DbImage.java b/src/main/java/org/openslx/imagemaster/db/DbImage.java
index bf643bb..f5b8ee4 100644
--- a/src/main/java/org/openslx/imagemaster/db/DbImage.java
+++ b/src/main/java/org/openslx/imagemaster/db/DbImage.java
@@ -59,4 +59,9 @@ public class DbImage
{
return MySQL.update( "UPDATE images SET images.image_path = ? WHERE images.UUID = ?", location, imageData.uuid );
}
+
+ public static int delete( ImageData imageData )
+ {
+ return MySQL.update( "DELETE FROM images WHERE images.UUID=?", imageData.uuid );
+ }
}
diff --git a/src/main/java/org/openslx/imagemaster/db/MySQL.java b/src/main/java/org/openslx/imagemaster/db/MySQL.java
index 121ef1b..06496ea 100644
--- a/src/main/java/org/openslx/imagemaster/db/MySQL.java
+++ b/src/main/java/org/openslx/imagemaster/db/MySQL.java
@@ -6,6 +6,7 @@ import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.List;
import java.util.Properties;
+
import com.mysql.jdbc.jdbc2.optional.MysqlDataSource;
import org.apache.log4j.Logger;