X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=datarouter-prov%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdatarouter%2Fprovisioning%2Futils%2FLogfileLoader.java;fp=datarouter-prov%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdatarouter%2Fprovisioning%2Futils%2FLogfileLoader.java;h=110c63de43b6bf950ead921bd53b76d4ab1d657a;hb=1cf4594108799897f096afc1ffb1dfb60e7aea31;hp=8975f1612f4f96203f07cf6b490390e2b904951d;hpb=26311ae5220efa4460c03284d0a47b2def420ecb;p=dmaap%2Fdatarouter.git

diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/LogfileLoader.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/LogfileLoader.java
index 8975f161..110c63de 100644
--- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/LogfileLoader.java
+++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/LogfileLoader.java
@@ -188,6 +188,7 @@ public class LogfileLoader extends Thread {
                         try {
                             Thread.sleep(1000L);
                         } catch (InterruptedException e) {
+                            Thread.currentThread().interrupt();
                         }
                         idle = false;
                     } else {
@@ -332,26 +333,25 @@ public class LogfileLoader extends Thread {
         Connection conn = null;
         try {
             conn = db.getConnection();
-            Statement stmt = conn.createStatement();
-            // Build a bitset of all records in the LOG_RECORDS table
-            // We need to run this SELECT in stages, because otherwise we run out of memory!
             RLEBitSet nbs = new RLEBitSet();
-            final long stepsize = 6000000L;
-            boolean go_again = true;
-            for (long i = 0; go_again; i += stepsize) {
-                String sql = String.format("select RECORD_ID from LOG_RECORDS LIMIT %d,%d", i, stepsize);
-                try(ResultSet rs = stmt.executeQuery(sql)) {
-                    go_again = false;
-                    while (rs.next()) {
-                        long n = rs.getLong("RECORD_ID");
-                        nbs.set(n);
-                        go_again = true;
+            try(Statement stmt = conn.createStatement()) {
+                // Build a bitset of all records in the LOG_RECORDS table
+                // We need to run this SELECT in stages, because otherwise we run out of memory!
+                final long stepsize = 6000000L;
+                boolean go_again = true;
+                for (long i = 0; go_again; i += stepsize) {
+                    String sql = String.format("select RECORD_ID from LOG_RECORDS LIMIT %d,%d", i, stepsize);
+                    try (ResultSet rs = stmt.executeQuery(sql)) {
+                        go_again = false;
+                        while (rs.next()) {
+                            long n = rs.getLong("RECORD_ID");
+                            nbs.set(n);
+                            go_again = true;
+                        }
                     }
                 }
             }
-            stmt.close();
             seq_set = nbs;
-
             // Compare with the range for this server
             // Determine the next ID for this set of record IDs
             RLEBitSet tbs = (RLEBitSet) nbs.clone();