aboutsummaryrefslogtreecommitdiff
path: root/node_modules/bluebird/js/release/util.js
diff options
context:
space:
mode:
authorFlorian Dold <florian.dold@gmail.com>2017-12-27 19:33:54 +0100
committerFlorian Dold <florian.dold@gmail.com>2017-12-27 19:34:16 +0100
commit0e6de2c31dbf8c21277481f112e99c52b913940f (patch)
tree91789032de3b8eec9d789acd1323f25fc5d08422 /node_modules/bluebird/js/release/util.js
parentceda0da31ad542c598c68146ae0712ca03df3d71 (diff)
node_modules
Diffstat (limited to 'node_modules/bluebird/js/release/util.js')
-rw-r--r--node_modules/bluebird/js/release/util.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/node_modules/bluebird/js/release/util.js b/node_modules/bluebird/js/release/util.js
index 84c28ec47..7ac0e2fa1 100644
--- a/node_modules/bluebird/js/release/util.js
+++ b/node_modules/bluebird/js/release/util.js
@@ -223,10 +223,11 @@ function safeToString(obj) {
}
function isError(obj) {
- return obj !== null &&
+ return obj instanceof Error ||
+ (obj !== null &&
typeof obj === "object" &&
typeof obj.message === "string" &&
- typeof obj.name === "string";
+ typeof obj.name === "string");
}
function markAsOriginatingFromRejection(e) {