Merge pull request #10 from rdkcentral/fix/double_dispose

Fix/double dispose

Author: wouterlucas

dist/thunderJS.js

@@ -215,6 +215,7 @@ function listener(plugin, event, callback, errorCallback) {
   return {
     dispose() {
       const listener_id = makeListenerId(plugin, event);
+      if (listeners[listener_id] === undefined) return
       listeners[listener_id].splice(index, 1);
       if (listeners[listener_id].length === 0) {
         unregister.call(thunder, plugin, event, errorCallback);

module/thunderJS.js

@@ -4,7 +4,7 @@
     "Metrological, Wouter <[email protected]>"
   ],
   "name": "ThunderJS",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "license": "apache",
   "browser": "dist/thunderJS.js",
   "main": "src/thunderJS.js",

package.json

@@ -28,6 +28,9 @@ export default function(plugin, event, callback, errorCallback) {
   return {
     dispose() {
       const listener_id = makeListenerId(plugin, event)
+      //early return if the listener is already deleted and someone is calling dispose twice
+      if (listeners[listener_id] === undefined) return
+
       listeners[listener_id].splice(index, 1)
 
       if (listeners[listener_id].length === 0) {

src/listener.js

@@ -224,6 +224,25 @@ test('thunderJS - notifications - error on invalid event', assert => {
   }, 250)
 })
 
+// should execute callback each time when notification listener is called
+test('thunderJS - notifications - call dispose twice', assert => {
+  resetStubsAndSpies()
+  let thunderJS = ThunderJS(options)
+
+  const TestListener = thunderJS.FooPlugin.on(
+    'bar',
+    () => {},
+    () => {}
+  )
+
+  assert.doesNotThrow(TestListener.dispose, 'First dispose should work')
+  assert.doesNotThrow(
+    TestListener.dispose,
+    'Second dispose should not an error, even though it no longer exists'
+  )
+  assert.end()
+})
+
 test('Teardown - thunderJS - calls', assert => {
   makeBodySpy.restore()
   apiRequestSpy.restore()