diff artifact-database/src/main/java/org/dive4elements/artifactdatabase/DatabaseCleaner.java @ 543:e9abf747f6ce

issue1847 Remove limit and break on empty ids
author Andre Heinecke <andre.heinecke@intevation.de>
date Thu, 03 Sep 2015 17:45:16 +0200
parents 9497f58484a0
children 266b599a4819
line wrap: on
line diff
--- a/artifact-database/src/main/java/org/dive4elements/artifactdatabase/DatabaseCleaner.java	Thu Sep 03 17:00:30 2015 +0200
+++ b/artifact-database/src/main/java/org/dive4elements/artifactdatabase/DatabaseCleaner.java	Thu Sep 03 17:45:16 2015 +0200
@@ -296,10 +296,6 @@
                     fetchIds = conn.prepareStatement(
                         SQL_OUTDATED.replace("$LOCKED_IDS$", questionMarks));
 
-                    // some dbms like derby do not support LIMIT
-                    // in SQL statements.
-                    fetchIds.setMaxRows(MAX_ROWS);
-
                     // Fetch ids of outdated collections
                     stmnt = conn.prepareStatement(
                         SQL_OUTDATED_COLLECTIONS.replace(
@@ -378,7 +374,7 @@
                         }
 
                         if (ids.isEmpty()) {
-                            continue;
+                            break;
                         }
 
                         for (int i = ids.size()-1; i >= 0; --i) {

http://dive4elements.wald.intevation.org