diff options
| author | Jonathan Bauer | 2015-09-17 18:19:00 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2015-09-17 18:19:00 +0200 |
| commit | adadb806c777cce949f85468802bf8964a8803cb (patch) | |
| tree | 570238996240e7a17550c82f4ce9aa3f0a2a96b9 /dozentenmodulserver/src/main/java | |
| parent | [client] success message when the upload creation finished (diff) | |
| parent | [server] Rename variable (since I messed up in the sqldump) (diff) | |
| download | tutor-module-adadb806c777cce949f85468802bf8964a8803cb.tar.gz tutor-module-adadb806c777cce949f85468802bf8964a8803cb.tar.xz tutor-module-adadb806c777cce949f85468802bf8964a8803cb.zip | |
Merge branch 'v1.1' of git.openslx.org:openslx-ng/tutor-module into v1.1
Diffstat (limited to 'dozentenmodulserver/src/main/java')
3 files changed, 5 insertions, 5 deletions
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbImage.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbImage.java index 7f12a5f6..34ecce5c 100644 --- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbImage.java +++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbImage.java @@ -906,7 +906,7 @@ public class DbImage { public enum DeleteState { KEEP, SHOULD_DELETE, - DO_DELETE; + WANT_DELETE; } public static void setDeletion(DeleteState shouldDelete, String... imageVersionIds) throws SQLException { @@ -914,7 +914,7 @@ public class DbImage { return; String ignoredOldState; if (shouldDelete == DeleteState.SHOULD_DELETE) { - ignoredOldState = DeleteState.DO_DELETE.name(); + ignoredOldState = DeleteState.WANT_DELETE.name(); } else { ignoredOldState = "invalid"; } diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/maintenance/DeleteOldImages.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/maintenance/DeleteOldImages.java index 23efa2f0..8cc2cd75 100644 --- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/maintenance/DeleteOldImages.java +++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/maintenance/DeleteOldImages.java @@ -130,7 +130,7 @@ public class DeleteOldImages implements Runnable { StringBuilder sb = new StringBuilder(); List<LocalImageVersion> deletables; try { - deletables = DbImage.getLocalWithState(DeleteState.DO_DELETE); + deletables = DbImage.getLocalWithState(DeleteState.WANT_DELETE); } catch (SQLException e2) { return null; } diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java index d1c4ede9..936e2272 100644 --- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java +++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java @@ -346,7 +346,7 @@ public class ServerHandler implements SatelliteServer.Iface { User.canDeleteImageVersionOrFail(user, imageVersionId); try { DbImage.markForDeletion(imageVersionId); - DbImage.setDeletion(DeleteState.DO_DELETE, imageVersionId); + DbImage.setDeletion(DeleteState.WANT_DELETE, imageVersionId); } catch (SQLException e) { throw new TInvocationException(); } @@ -374,7 +374,7 @@ public class ServerHandler implements SatelliteServer.Iface { if (index != 0) { try { DbImage.markForDeletion(ids); - DbImage.setDeletion(DeleteState.DO_DELETE, ids); + DbImage.setDeletion(DeleteState.WANT_DELETE, ids); } catch (Exception e) { LOGGER.warn("Could not delete version when trying to delete base image", e); } |