Skip to content

Commit 620d30f

Browse files
committed
Fix null cause handling when closing protocol handler
1 parent 310ab16 commit 620d30f

1 file changed

Lines changed: 16 additions & 9 deletions

File tree

mid-java-client-core/src/main/java/ch/swisscom/mid/client/impl/MIDClientImpl.java

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -93,15 +93,22 @@ public void close() {
9393
if (selectedProtocolHandler != null) {
9494
try {
9595
selectedProtocolHandler.close();
96-
} catch (Exception e) {
97-
logClient.debug("ComProtocolHandler failed to close: {}: {}, cause: {}: {}",
98-
e.getClass().getSimpleName(),
99-
e.getLocalizedMessage(),
100-
e.getCause().getClass(),
101-
e.getCause().getLocalizedMessage());
102-
}
103-
}
104-
}
96+
} catch (Exception e) {
97+
Throwable cause = e.getCause();
98+
if (cause != null) {
99+
logClient.debug("ComProtocolHandler failed to close: {}: {}, cause: {}: {}",
100+
e.getClass().getSimpleName(),
101+
e.getLocalizedMessage(),
102+
cause.getClass().getSimpleName(),
103+
cause.getLocalizedMessage());
104+
} else {
105+
logClient.debug("ComProtocolHandler failed to close: {}: {}, cause: <none>",
106+
e.getClass().getSimpleName(),
107+
e.getLocalizedMessage());
108+
}
109+
}
110+
}
111+
}
105112

106113
// ----------------------------------------------------------------------------------------------------
107114

0 commit comments

Comments
 (0)