Add current owner to PortInUseException

Signed-off-by: Fabian Wolter <[email protected]>
openhab · Jan 17, 2021 · 73048ef · 73048ef
1 parent 127724c
commit 73048ef
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/...src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortIdentifierImpl.java b/...src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortIdentifierImpl.java
@@ -57,7 +57,12 @@ public SerialPort open(String owner, int timeout) throws PortInUseException {
                         String.format("We expect an serial port instead of '%s'", cp.getClass()));
             }
         } catch (javax.comm.PortInUseException e) {
-            throw new PortInUseException();
+            String message = e.getMessage();
+            if (message != null) {
+                throw new PortInUseException(message);
+            } else {
+                throw new PortInUseException();
+            }
         }
     }
 

diff --git a/...src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortIdentifierImpl.java b/...src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortIdentifierImpl.java
@@ -58,7 +58,12 @@ public SerialPort open(String owner, int timeout) throws PortInUseException {
                         String.format("We expect an serial port instead of '%s'", cp.getClass()));
             }
         } catch (gnu.io.PortInUseException e) {
-            throw new PortInUseException();
+            String message = e.getMessage();
+            if (message != null) {
+                throw new PortInUseException(message);
+            } else {
+                throw new PortInUseException();
+            }
         }
     }
 

diff --git a/...ansport.serial/src/main/java/org/openhab/core/io/transport/serial/PortInUseException.java b/...ansport.serial/src/main/java/org/openhab/core/io/transport/serial/PortInUseException.java
@@ -23,4 +23,12 @@
 public class PortInUseException extends Exception {
 
     private static final long serialVersionUID = -2709480420743139383L;
+
+    public PortInUseException() {
+        super();
+    }
+
+    public PortInUseException(String message) {
+        super(message);
+    }
 }