From 23c38b1f4ed1790ce4222e3f6e5b4dd2280a84a1 Mon Sep 17 00:00:00 2001
From: Panu Horsmalahti <phorsmalahti@mirantis.com>
Date: Thu, 20 Jan 2022 12:01:42 +0200
Subject: [PATCH] Fix race condition with extension loading. (#4724)

Signed-off-by: Panu Horsmalahti <phorsmalahti@mirantis.com>
---
 src/extensions/extension-loader/extension-loader.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/extensions/extension-loader/extension-loader.ts b/src/extensions/extension-loader/extension-loader.ts
index 3a0539666a..afe09cce19 100644
--- a/src/extensions/extension-loader/extension-loader.ts
+++ b/src/extensions/extension-loader/extension-loader.ts
@@ -325,6 +325,8 @@ export class ExtensionLoader {
               extension,
             );
 
+            this.instances.set(extId, instance);
+
             return {
               extId,
               instance,
@@ -353,8 +355,6 @@ export class ExtensionLoader {
         logger.error(`${logModule}: failed to enable`, { ext: extension, err });
       });
 
-      this.instances.set(extension.extId, extension.instance);
-
       return {
         isBundled: extension.isBundled,
         loaded,