Fix faulty pathExists race condition (SAP#2605)

y-kkamil · Mar 14, 2022 · f091955 · f091955
1 parent c734c8f
commit f091955
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/client/src/linkManager.js b/client/src/linkManager.js
@@ -290,7 +290,7 @@ export class linkManager extends LuigiClientBase {
    *  );
    */
   pathExists(path) {
-    const currentId = Date.now();
+    const currentId = helpers.getRandomId();
     const pathExistsPromises = this.getPromise('pathExistsPromises') || {};
     pathExistsPromises[currentId] = {
       resolveFn: function() {},
@@ -306,12 +306,14 @@ export class linkManager extends LuigiClientBase {
       function(e, listenerId) {
         const data = e.data.data;
         const pathExistsPromises = this.getPromise('pathExistsPromises') || {};
-        if (pathExistsPromises[data.correlationId]) {
-          pathExistsPromises[data.correlationId].resolveFn(data.pathExists);
-          delete pathExistsPromises[data.correlationId];
-          this.setPromise('pathExistsPromises', pathExistsPromises);
+        if (data.correlationId === currentId) {
+          if (pathExistsPromises[data.correlationId]) {
+            pathExistsPromises[data.correlationId].resolveFn(data.pathExists);
+            delete pathExistsPromises[data.correlationId];
+            this.setPromise('pathExistsPromises', pathExistsPromises);
+          }
+          helpers.removeEventListener(listenerId);
         }
-        helpers.removeEventListener(listenerId);
       }.bind(this)
     );