[sonyprojector] Fix handling of InterruptedException (Thread.sleep) (o…

…penhab#10458) Signed-off-by: Laurent Garnier <lg.hc@free.fr>
bosch-io · Apr 6, 2021 · 16b9e25 · 16b9e25
1 parent 5b97857
commit 16b9e25
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/...java/org/openhab/binding/sonyprojector/internal/communication/SonyProjectorConnector.java b/...java/org/openhab/binding/sonyprojector/internal/communication/SonyProjectorConnector.java
@@ -950,9 +950,13 @@ private synchronized void sendIR(SonyProjectorItem item) throws SonyProjectorExc
             if (!runningSession) {
                 close();
             }
-        } catch (SonyProjectorException | InterruptedException e) {
+        } catch (SonyProjectorException e) {
             logger.debug("Send IR {} failed: {}", item.getName(), e.getMessage());
             throw new SonyProjectorException("Send IR " + item.getName() + " failed: " + e.getMessage());
+        } catch (InterruptedException e) {
+            logger.debug("Send IR {} interrupted: {}", item.getName(), e.getMessage());
+            Thread.currentThread().interrupt();
+            throw new SonyProjectorException("Send IR " + item.getName() + " interrupted: " + e.getMessage());
         }
 
         logger.debug("Send IR {} succeeded", item.getName());

diff --git a/...hab/binding/sonyprojector/internal/communication/serial/SonyProjectorSerialConnector.java b/...hab/binding/sonyprojector/internal/communication/serial/SonyProjectorSerialConnector.java
@@ -302,6 +302,7 @@ public void serialEvent(SerialPortEvent serialPortEvent) {
             logger.debug("RXTX library CPU load workaround, sleep forever");
             Thread.sleep(Long.MAX_VALUE);
         } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
         }
     }
 }