* Fix swallowed InterruptedException (issue bytedeco/javacv#315)

bytedeco · Jan 30, 2016 · f7161d0 · f7161d0
1 parent 2f16e6b
commit f7161d0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,5 @@
 
+ * Fix swallowed `InterruptedException` ([issue bytedeco/javacv#315](https://github.com/bytedeco/javacv/issues/315))
  * Adjust a few things in `Generator` preventing `@Virtual` from working properly in some cases ([issue bytedeco/javacpp-presets#143](https://github.com/bytedeco/javacpp-presets/issues/143))
  * Fix `TokenIndexer` inserting an invalid token while expanding macros ending with a backslash ([issue #63](https://github.com/bytedeco/javacpp/issues/63))
  * Make `Parser` take `Info.skip` into account for `enum` declarations as well

diff --git a/src/main/java/org/bytedeco/javacpp/Loader.java b/src/main/java/org/bytedeco/javacpp/Loader.java
@@ -587,7 +587,10 @@ public static String loadLibrary(URL[] urls, String libnameversion) {
                         // ... else wait until the file is at least 1 second old ...
                         try {
                             Thread.sleep(1000);
-                        } catch (InterruptedException ex) { }
+                        } catch (InterruptedException ex) {
+                            // ... reset interrupt to be nice ...
+                            Thread.currentThread().interrupt();
+                        }
                     }
                 }
                 if (file != null && file.exists()) {
@@ -673,7 +676,7 @@ public static String loadLibrary(URL[] urls, String libnameversion) {
     }
 
     // ... that makes sure to delete all our files.
-    public static void main(String[] args) {
+    public static void main(String[] args) throws InterruptedException {
         File tmpdir = new File(System.getProperty("java.io.tmpdir"));
         File tempDir = new File(args[0]);
         if (!tmpdir.equals(tempDir.getParentFile()) ||
@@ -683,9 +686,7 @@ public static void main(String[] args) {
         }
         for (File file : tempDir.listFiles()) {
             while (file.exists() && !file.delete()) {
-                try {
-                    Thread.sleep(100);
-                } catch (InterruptedException e) { }
+                Thread.sleep(100);
             }
         }
         tempDir.delete();