[fix] null values should merge properly instead of throwing errors

indexzero · Sep 9, 2012 · da39d3c · da39d3c · justgord · Sep 9, 2012
1 parent 7421836
commit da39d3c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/lib/nconf/provider.js b/lib/nconf/provider.js
@@ -539,7 +539,7 @@ Provider.prototype._execute = function (action, syncLength /* [arguments] */) {
       response = store[action].apply(store, args);
 
       // Merge objects if necessary
-      if (action === 'get' && typeof response === 'object' && !Array.isArray(response)) {
+      if (response && action === 'get' && typeof response === 'object' && !Array.isArray(response)) {
         mergeObjs.push(response);
         response = undefined;
       }

diff --git a/test/fixtures/data.js b/test/fixtures/data.js
@@ -6,6 +6,7 @@
  */
 
 exports.data = {
+  isNull: null,
   literal: 'bazz', 
   arr: ['one', 2, true, { value: 'foo' }],
   obj: {