diff options
| author | Marek Kotewicz <marek.kotewicz@gmail.com> | 2015-01-27 16:36:39 +0800 |
|---|---|---|
| committer | Marek Kotewicz <marek.kotewicz@gmail.com> | 2015-01-27 16:36:39 +0800 |
| commit | 1f5a6f13419415b4c05519e126eedcdf815aff7c (patch) | |
| tree | de2d9551d3746ab3e4c8c38501ae0a1b6eac09d5 /lib/providermanager.js | |
| parent | d223ac0379c4c1f8c209e777ec9ed63384590157 (diff) | |
| parent | da4c2d530d6f9b8ba54221c6812f77766a33fed6 (diff) | |
| download | dexon-1f5a6f13419415b4c05519e126eedcdf815aff7c.tar dexon-1f5a6f13419415b4c05519e126eedcdf815aff7c.tar.gz dexon-1f5a6f13419415b4c05519e126eedcdf815aff7c.tar.bz2 dexon-1f5a6f13419415b4c05519e126eedcdf815aff7c.tar.lz dexon-1f5a6f13419415b4c05519e126eedcdf815aff7c.tar.xz dexon-1f5a6f13419415b4c05519e126eedcdf815aff7c.tar.zst dexon-1f5a6f13419415b4c05519e126eedcdf815aff7c.zip | |
Merge branch 'develop' into cpp
Conflicts:
dist/ethereum.js.map
dist/ethereum.min.js
Diffstat (limited to 'lib/providermanager.js')
| -rw-r--r-- | lib/providermanager.js | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/providermanager.js b/lib/providermanager.js index 83e11605b..1a550e5f4 100644 --- a/lib/providermanager.js +++ b/lib/providermanager.js @@ -49,15 +49,15 @@ var ProviderManager = function() { result = JSON.parse(result); - // dont call the callback if result is an error, empty array or false - if (result.error || (result.result instanceof Array ? result.result.length === 0 : !result.result)) { + // dont call the callback if result is not an array, or empty one + if (result.error || !(result.result instanceof Array) || result.result.length === 0) { return; } - data.callback(result); + data.callback(result.result); }); } - setTimeout(poll, 12000); + setTimeout(poll, 1000); }; poll(); }; @@ -70,7 +70,7 @@ ProviderManager.prototype.send = function(data) { if (this.provider === undefined) { console.error('provider is not set'); - return undefined; + return null; } //TODO: handle error here? |