improved filter interval

web3 · Jun 5, 2015 · d9ce08e · d9ce08e
1 parent ddafe00
commit d9ce08e
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 22 deletions.
diff --git a/dist/web3-light.js b/dist/web3-light.js
diff --git a/dist/web3-light.js.map b/dist/web3-light.js.map
diff --git a/dist/web3-light.min.js b/dist/web3-light.min.js
diff --git a/dist/web3.js b/dist/web3.js
diff --git a/dist/web3.js.map b/dist/web3.js.map
diff --git a/dist/web3.min.js b/dist/web3.min.js
diff --git a/lib/web3/filter.js b/lib/web3/filter.js
@@ -101,8 +101,8 @@ Filter.prototype.watch = function (callback) {
         if(self.filterId || self.filterError)
             clearInterval(intervalId);
 
-        if(self.filterError || !self.filterId)
-            return; 
+        if(!self.filterId)
+            return;
 
         self.callbacks.push(callback);
 

diff --git a/lib/web3/requestmanager.js b/lib/web3/requestmanager.js
@@ -226,9 +226,16 @@ RequestManager.prototype.poll = function () {
         }
 
         results.map(function (result, index) {
-            result.callback = self.polls[index].callback;
-            return result;
+            // make sure the filter is still installed after arrival of the request
+            if(self.polls[index]) {
+                result.callback = self.polls[index].callback;
+                return result;
+            } else
+                return false;
         }).filter(function (result) {
+            if(!result)
+                return false;
+
             var valid = Jsonrpc.getInstance().isValidResponse(result);
             if (!valid) {
                 result.callback(errors.InvalidResponse(result));