handle unhandled InterruptedException

flyingsaucerproject · May 20, 2024 · 7d74296 · 7d74296
1 parent 5a75aff
commit 7d74296
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 9 deletions.
diff --git a/flying-saucer-core/src/main/java/org/xhtmlrenderer/swing/ImageLoadWorker.java b/flying-saucer-core/src/main/java/org/xhtmlrenderer/swing/ImageLoadWorker.java
@@ -76,8 +76,8 @@ public void run() {
                 final BufferedImage newImg1 = newImg;
                 EventQueue.invokeLater(() -> loadItem._mfsImage.setImage(loadItem._uri, newImg1, wasScaled));
             }
-        } catch (InterruptedException e) {
-            //
+        } catch (InterruptedException ignore) {
+            Thread.currentThread().interrupt();
         }
     }
 }
diff --git a/flying-saucer-core/src/main/java/org/xhtmlrenderer/swing/RootPanel.java b/flying-saucer-core/src/main/java/org/xhtmlrenderer/swing/RootPanel.java
@@ -615,6 +615,7 @@ public void repaintRequested(final boolean doLayout) {
                             repaintRequestPending = false;
                         });
                     } catch (InterruptedException ignore) {
+                        Thread.currentThread().interrupt();
                     }
                 }).start();
             } else {

diff --git a/flying-saucer-core/src/main/java/org/xhtmlrenderer/swing/SelectionHighlighter.java b/flying-saucer-core/src/main/java/org/xhtmlrenderer/swing/SelectionHighlighter.java
@@ -178,6 +178,7 @@ private boolean checkDocument() {
                     try {
                         Thread.sleep(10);
                     } catch (InterruptedException e) {
+                        Thread.currentThread().interrupt();
                         return false;
                     }
                 } catch (ClassCastException cce) {

diff --git a/flying-saucer-examples/nomaven/misc/src/main/java/Review.java b/flying-saucer-examples/nomaven/misc/src/main/java/Review.java
@@ -404,8 +404,8 @@ public synchronized void waitForFlag() {
             while (!isSet) {
                 try {
                     wait();
-                } catch (InterruptedException ie) {
-                    // swallow
+                } catch (InterruptedException ignore) {
+                    Thread.currentThread().interrupt();
                 }
             }
         }
@@ -421,4 +421,4 @@ public synchronized void interruptibleWaitForFlag()
         }
     }
 
-}
+}
diff --git a/flying-saucer-examples/src/main/java/org/xhtmlrenderer/demo/browser/BrowserStatus.java b/flying-saucer-examples/src/main/java/org/xhtmlrenderer/demo/browser/BrowserStatus.java
@@ -44,7 +44,8 @@ public void createEvents() {
                     final String text = used + "M / " + total + "M";
                     SwingUtilities.invokeLater(() -> memory.setText(text));
                     Thread.sleep(5000);
-                } catch (InterruptedException e) {
+                } catch (InterruptedException ignore) {
+                    Thread.currentThread().interrupt();
                     break;
                 }
             }

diff --git a/...g-saucer-swt-examples/src/main/java/org/xhtmlrenderer/demo/browser/swt/BrowserStatus.java b/...g-saucer-swt-examples/src/main/java/org/xhtmlrenderer/demo/browser/swt/BrowserStatus.java
@@ -95,7 +95,8 @@ public synchronized void run() {
                         }
                     });
                     wait(REFRESH_INTERVAL);
-                } catch (InterruptedException e) {
+                } catch (InterruptedException ignore) {
+                    Thread.currentThread().interrupt();
                     break;
                 }
             }

diff --git a/src/experimental/java/org/xhtmlrenderer/experimental/WorkQueue.java b/src/experimental/java/org/xhtmlrenderer/experimental/WorkQueue.java
@@ -58,8 +58,8 @@ public void run() {
                         while (queue.isEmpty()) {
                             try {
                                 queue.wait();
-                            } catch (InterruptedException e) {
-                                // ignore
+                            } catch (InterruptedException ignore) {
+                                Thread.currentThread().interrupt();
                             }
                             task = (Runnable) queue.removeFirst();
                             try {