summaryrefslogtreecommitdiffstats
path: root/container-messagebus
diff options
context:
space:
mode:
authorJon Marius Venstad <venstad@gmail.com>2021-09-09 09:31:42 +0200
committerJon Marius Venstad <venstad@gmail.com>2021-09-09 09:31:42 +0200
commit477178043c0d4052029b5e7ee4f2e57e5f92607f (patch)
tree927552c3f532fb026244674d8a7ef66414d1d7b6 /container-messagebus
parent41849d01565f48f859b7bc9a54438e6479657f41 (diff)
Destroy only when held item exists
Diffstat (limited to 'container-messagebus')
-rw-r--r--container-messagebus/src/main/java/com/yahoo/container/jdisc/messagebus/NetworkMultiplexerHolder.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/container-messagebus/src/main/java/com/yahoo/container/jdisc/messagebus/NetworkMultiplexerHolder.java b/container-messagebus/src/main/java/com/yahoo/container/jdisc/messagebus/NetworkMultiplexerHolder.java
index 3c465835589..89ecc931efb 100644
--- a/container-messagebus/src/main/java/com/yahoo/container/jdisc/messagebus/NetworkMultiplexerHolder.java
+++ b/container-messagebus/src/main/java/com/yahoo/container/jdisc/messagebus/NetworkMultiplexerHolder.java
@@ -38,8 +38,10 @@ public class NetworkMultiplexerHolder extends AbstractComponent {
@Override
public void deconstruct() {
synchronized (monitor) {
- net.destroy();
- net = null;
+ if (net != null) {
+ net.destroy();
+ net = null;
+ }
destroyed = true;
}
}