From 477178043c0d4052029b5e7ee4f2e57e5f92607f Mon Sep 17 00:00:00 2001
From: Jon Marius Venstad <venstad@gmail.com>
Date: Thu, 9 Sep 2021 09:31:42 +0200
Subject: Destroy only when held item exists

---
 .../yahoo/container/jdisc/messagebus/NetworkMultiplexerHolder.java  | 6 ++++--
 1 file 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;
         }
     }
-- 
cgit v1.2.3