[api]: Restore Thread interrupt status on catch

tiagohm · Oct 15, 2024 · f256f08 · f256f08
1 parent d32c2b8
commit f256f08
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/...a-discovery-protocol/src/main/kotlin/nebulosa/alpaca/discovery/AlpacaDiscoveryProtocol.kt b/...a-discovery-protocol/src/main/kotlin/nebulosa/alpaca/discovery/AlpacaDiscoveryProtocol.kt
@@ -50,6 +50,7 @@ class AlpacaDiscoveryProtocol : Runnable, AutoCloseable {
                             val message = DatagramPacket(discoveryMessage, discoveryMessage.size, address.broadcast, 32227)
                             socket.send(message)
                         } catch (_: InterruptedException) {
+                            Thread.currentThread().interrupt()
                             break
                         } catch (e: IOException) {
                             LOG.e("socket IPv4 send error", e)
@@ -58,6 +59,7 @@ class AlpacaDiscoveryProtocol : Runnable, AutoCloseable {
                 }
             }
         } catch (_: InterruptedException) {
+            Thread.currentThread().interrupt()
         } catch (e: SocketException) {
             LOG.e("socket error", e)
         }
@@ -66,6 +68,7 @@ class AlpacaDiscoveryProtocol : Runnable, AutoCloseable {
             val message = DatagramPacket(discoveryMessage, discoveryMessage.size, InetAddress.getByName("ff12::00a1:9aca"), 32227)
             socket.send(message)
         } catch (_: InterruptedException) {
+            Thread.currentThread().interrupt()
         } catch (e: IOException) {
             LOG.e("socket IPv6 send error", e)
         }
@@ -78,6 +81,7 @@ class AlpacaDiscoveryProtocol : Runnable, AutoCloseable {
             try {
                 socket.receive(packet)
             } catch (_: InterruptedException) {
+                Thread.currentThread().interrupt()
                 break
             } catch (e: IOException) {
                 LOG.e("socket receive error", e)

diff --git a/nebulosa-guiding-phd2/src/main/kotlin/nebulosa/guiding/phd2/PHD2Guider.kt b/nebulosa-guiding-phd2/src/main/kotlin/nebulosa/guiding/phd2/PHD2Guider.kt
@@ -236,6 +236,7 @@ class PHD2Guider(private val client: PHD2Client) : Guider, PHD2EventListener {
         try {
             settling.await(settleTimeout)
         } catch (_: InterruptedException) {
+            Thread.currentThread().interrupt()
             LOG.dw("PHD2 did not send SettleDone message in expected time")
         } catch (e: Throwable) {
             LOG.e("an error occurrs while waiting for settle done", e)

diff --git a/nebulosa-indi-protocol/src/main/kotlin/nebulosa/indi/protocol/parser/INDIProtocolReader.kt b/nebulosa-indi-protocol/src/main/kotlin/nebulosa/indi/protocol/parser/INDIProtocolReader.kt
@@ -47,6 +47,7 @@ class INDIProtocolReader(
             listeners.onEach { it.onConnectionClosed() }.clear()
             parser.close()
         } catch (_: InterruptedException) {
+            currentThread().interrupt()
             running = false
         } catch (e: Throwable) {
             running = false

diff --git a/nebulosa-util/src/main/kotlin/nebulosa/util/exec/CommandLine.kt b/nebulosa-util/src/main/kotlin/nebulosa/util/exec/CommandLine.kt
@@ -141,7 +141,8 @@ class CommandLine internal constructor(
                     inputReader?.waitFor()
                     errorReader?.waitFor()
                 }
-            } catch (ignored: InterruptedException) {
+            } catch (_: InterruptedException) {
+                currentThread().interrupt()
             } finally {
                 if (process.isAlive) {
                     process.destroyForcibly()
@@ -160,10 +161,7 @@ class CommandLine internal constructor(
         }
     }
 
-    private inner class StreamLineReader(
-        stream: InputStream,
-        private val isError: Boolean,
-    ) : Thread("Command Line ${if (isError) "Error" else "Input"} Stream Line Reader") {
+    private inner class StreamLineReader(stream: InputStream, isError: Boolean) : Thread("Command Line ${if (isError) "Error" else "Input"} Stream Line Reader") {
 
         private val reader = stream.bufferedReader()
         private val completable = CompletableFuture<Unit>()
@@ -182,6 +180,7 @@ class CommandLine internal constructor(
                     }
                 }
             } catch (e: InterruptedException) {
+                currentThread().interrupt()
                 LOG.dw("command line interrupted")
             } catch (e: Throwable) {
                 LOG.dw("command line exited: {}", e.message)