diff options
| author | Simon Rettberg | 2015-09-17 18:02:37 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2015-09-17 18:02:37 +0200 |
| commit | c7e4d73c6126fe2a8826320d56d6a8f8e5f9c37d (patch) | |
| tree | 637c20af1c409cfc511706a68abe1ee75e7d9814 /dozentenmodulserver | |
| parent | Revert "[server] Fix SQL dump of DB" (diff) | |
| download | tutor-module-c7e4d73c6126fe2a8826320d56d6a8f8e5f9c37d.tar.gz tutor-module-c7e4d73c6126fe2a8826320d56d6a8f8e5f9c37d.tar.xz tutor-module-c7e4d73c6126fe2a8826320d56d6a8f8e5f9c37d.zip | |
[server] Rename variable (since I messed up in the sqldump)
Diffstat (limited to 'dozentenmodulserver')
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); } |