Skip to content

Commit

Permalink
fix faulty promise detection that prevented user supplied promise lib…
Browse files Browse the repository at this point in the history
…s from being used

bump version and changelog
  • Loading branch information
James Butler committed Nov 28, 2016
1 parent d17b7c0 commit a630c20
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Change Log

## [3.1.4] - November 28 2016
- fix faulty Promise detection where user supplied promise lib would be ignored

## [3.1.3] - November 26 2016
- internal refactoring and comment improvements
- fix #159 so draining and closing don't leave resources behind
Expand Down Expand Up @@ -138,7 +141,8 @@
- First NPM release

=======
[unreleased]: https://github.com/coopernurse/node-pool/compare/v3.1.2...HEAD
[unreleased]: https://github.com/coopernurse/node-pool/compare/v3.1.4...HEAD
[3.1.4]: https://github.com/coopernurse/node-pool/compare/v3.1.3...v3.1.4
[3.1.3]: https://github.com/coopernurse/node-pool/compare/v3.1.2...v3.1.3
[3.1.2]: https://github.com/coopernurse/node-pool/compare/v3.1.1...v3.1.2
[3.1.1]: https://github.com/coopernurse/node-pool/compare/v3.1.0...v3.1.1
Expand Down
2 changes: 1 addition & 1 deletion lib/PoolOptions.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ class PoolOptions {
this.softIdleTimeoutMillis = opts.softIdleTimeoutMillis || poolDefaults.softIdleTimeoutMillis
this.idleTimeoutMillis = opts.idleTimeoutMillis || poolDefaults.idleTimeoutMillis

this.Promise = (typeof opts.Promise === 'object') ? opts.Promise : poolDefaults.Promise
this.Promise = (opts.Promise != null) ? opts.Promise : poolDefaults.Promise
}
}

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "generic-pool",
"description": "Generic resource pooling for Node.JS",
"version": "3.1.3",
"version": "3.1.4",
"author": "James Cooper <[email protected]>",
"contributors": [
{
Expand Down

0 comments on commit a630c20

Please sign in to comment.