Merge branch 'next' into fix/cpp-manage-sdk

languages/javascript/src/shared/Events/index.mjs

@@ -177,14 +177,16 @@ const doListen = function(module, event, callback, context, once, internal=false
           resolve(listenerId)
         }
         else {
+          // Remove the listener from external list on failure to subscribe
+          // TODO: Instead of removing, the failed subscription shouldn't be put into the external list
+          listeners.remove(listenerId)
           reject(error)
         }
       })
     }
     else {
       resolve(listenerId)
     }
-
     return p
   }
 }