Merge pull request #85 from RADAR-base/tmp-dir-hotfix

Tmp dir hotfix: release 1.1.4.1

Author: blootsvoets

build.gradle

@@ -9,7 +9,7 @@ plugins {
 }
 
 group 'org.radarbase'
-version '1.1.4'
+version '1.1.4.1'
 mainClassName = 'org.radarbase.output.Application'
 
 sourceCompatibility = '1.8'

src/main/java/org/radarbase/output/cleaner/SourceDataCleaner.kt

@@ -62,8 +62,9 @@ class SourceDataCleaner(
         return try {
             lockManager.tryRunLocked(topic) {
                 Accountant(fileStoreFactory, topic).use { accountant ->
-                    val extractionCheck = TimestampExtractionCheck(sourceStorage, fileStoreFactory)
-                    deleteOldFiles(accountant, extractionCheck, topic, topicPath).toLong()
+                    TimestampExtractionCheck(sourceStorage, fileStoreFactory).use { extractionCheck ->
+                        deleteOldFiles(accountant, extractionCheck, topic, topicPath).toLong()
+                    }
                 }
             }
         } catch (ex: IOException) {

src/main/java/org/radarbase/output/cleaner/TimestampExtractionCheck.kt

@@ -47,7 +47,6 @@ class TimestampExtractionCheck(
         reader.close()
     }
 
-
     private fun containsRecord(topicFile: TopicFile, offset: Long, record: GenericRecord): Boolean {
         var suffix = 0
 

src/main/java/org/radarbase/output/util/TemporaryDirectory.kt

@@ -46,15 +46,7 @@ constructor(root: Path, prefix: String) : Closeable {
     private fun doClose() {
         try {
             // Ignore errors the first time
-            Files.walk(path)
-                    .sorted(Comparator.reverseOrder())
-                    .forEach {
-                        try {
-                            Files.deleteIfExists(it)
-                        } catch (ex: Exception) {
-                            // do nothing
-                        }
-                    }
+            deleteTree()
         } catch (ex: IOException) {
             // ignore the first time
         }
@@ -68,30 +60,33 @@ constructor(root: Path, prefix: String) : Closeable {
                     Thread.currentThread().interrupt()
                 }
 
-                Files.walk(path)
-                        .sorted(Comparator.reverseOrder())
-                        .forEach {
-                            try {
-                                Files.deleteIfExists(it)
-                            } catch (ex: Exception) {
-                                logger.warn("Cannot delete temporary path {}: {}",
-                                        it, ex.toString())
-                            }
-                        }
+                deleteTree()
             }
         } catch (ex: IOException) {
             logger.warn("Cannot delete temporary directory {}: {}", path, ex.toString())
         }
     }
 
+    private fun deleteTree() {
+        Files.walk(path)
+                .sorted(Comparator.reverseOrder())
+                .forEach {
+                    try {
+                        Files.deleteIfExists(it)
+                    } catch (ex: Exception) {
+                        logger.warn("Cannot delete temporary path {}: {}",
+                                it, ex.toString())
+                    }
+                }
+    }
+
     override fun close() {
         doClose()
         try {
             Runtime.getRuntime().removeShutdownHook(shutdownHook)
         } catch (ex: IllegalStateException) {
             // already shutting down
         }
-
     }
 
     companion object {