From cfb28f6a1fe9df9627f9f80f9a42e0ea26725ddb Mon Sep 17 00:00:00 2001
From: Jerome Gerakis <66950409+J-Gerakis@users.noreply.github.com>
Date: Mon, 21 Sep 2020 10:27:12 +0100
Subject: [PATCH] backport of bugfix ENT-5752 into OS 4.3 (#6724)

---
 .../net/corda/node/services/network/NetworkMapUpdater.kt     | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/node/src/main/kotlin/net/corda/node/services/network/NetworkMapUpdater.kt b/node/src/main/kotlin/net/corda/node/services/network/NetworkMapUpdater.kt
index d39f6fbc8f..50d284b48e 100644
--- a/node/src/main/kotlin/net/corda/node/services/network/NetworkMapUpdater.kt
+++ b/node/src/main/kotlin/net/corda/node/services/network/NetworkMapUpdater.kt
@@ -142,6 +142,11 @@ class NetworkMapUpdater(private val networkMapCache: NetworkMapCacheInternal,
                 val nextScheduleDelay = try {
                     updateNetworkMapCache()
                 } catch (e: Exception) {
+                    // Check to see if networkmap was reachable before and cached information exists
+                    if (networkMapCache.allNodeHashes.size > 1) {
+                        logger.debug("Networkmap Service unreachable but more than one nodeInfo entries found in the cache. Allowing node start-up to proceed.")
+                        networkMapCache.nodeReady.set(null)
+                    }
                     logger.warn("Error encountered while updating network map, will retry in $defaultRetryInterval", e)
                     defaultRetryInterval
                 }