merge with upstream

simonlast · Nov 27, 2014 · 64db9b7 · 64db9b7
2 parents 5d8a461 + b7946dd
commit 64db9b7
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/node-persist.js b/node-persist.js
@@ -561,7 +561,7 @@ var setOptions = function (userOptions) {
         options = defaults;
     } else {
         for (var key in defaults) {
-            if (userOptions[key] != null) { // not null and not undefined
+            if (userOptions.hasOwnProperty(key)) {
                 options[key] = userOptions[key];
             } else {
                 options[key] = defaults[key];
@@ -739,4 +739,4 @@ var parseFileSync = function(key, dir, hash) {
 var isExpired = function (key) {
     if (!options.ttl) return false;
     return ttls[key] < (new Date()).getTime();
-};
+};