Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add current owner to PortInUseException #2126

Merged
merged 2 commits into from
Jan 21, 2021
Merged

Add current owner to PortInUseException #2126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
573b69e
Add current owner to PortInUseException
fwolter Jan 17, 2021
f19bf78
Preserve cause
Jan 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion ...src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortIdentifierImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, e);
} else {
throw new PortInUseException(e);
}
}
}

Expand Down
7 changes: 6 additions & 1 deletion ...src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortIdentifierImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, e);
} else {
throw new PortInUseException(e);
}
}
}

Expand Down
8 changes: 8 additions & 0 deletions ...ansport.serial/src/main/java/org/openhab/core/io/transport/serial/PortInUseException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,12 @@
public class PortInUseException extends Exception {

private static final long serialVersionUID = -2709480420743139383L;

public PortInUseException(String message, Exception cause) {
super(message, cause);
}

public PortInUseException(Exception cause) {
super(cause);
}
}