silencing out removed non-existent exceptions

Author: theodorDiaconu

lib/cache/ObservableCollection.js

@@ -262,14 +262,7 @@ export default class ObservableCollection {
     remove(docId) {
         const doc = this.store.pop(docId);
         if (doc != null) {
-            try {
-                this.multiplexer.removed(docId, doc);
-            } catch (e) {
-                // Supressing `removed non-existent exceptions`
-                if (!isRemovedNonExistent(e)) {
-                    throw e;
-                }
-            }
+            this.multiplexer.removed(docId, doc);
         }
     }
 

lib/mongo/ObserveMultiplex.js

@@ -214,6 +214,18 @@ _.extend(ObserveMultiplexer.prototype, {
                 if (!handle) return;
                 var callback = handle['_' + callbackName];
                 // clone arguments so that callbacks can mutate their arguments
+
+                // We silence out removed exceptions
+                if (callback === 'removed') {
+                    try {
+                        callback.apply(null, EJSON.clone(args));
+                    } catch (e) {
+                        // Supressing `removed non-existent exceptions`
+                        if (!isRemovedNonExistent(e)) {
+                            throw e;
+                        }
+                    }
+                }
                 callback && callback.apply(null, EJSON.clone(args));
             });
         });

lib/mongo/extendObserveChanges.js

@@ -1,5 +1,4 @@
 import { DDP } from 'meteor/ddp';
-import isRemovedNonExistent from '../utils/isRemovedNonExistent';
 import { Mongo, MongoInternals } from 'meteor/mongo';
 import { LocalCollection } from 'meteor/minimongo';
 import { Random } from 'meteor/random';