TheThing/nconf-lite
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[fix] Only merge actual objects, not null values. Fixes #150.

Browse source
This commit is contained in:
indexzero 2015-09-20 01:02:59 -07:00
parent a3589fab95
commit 4b5030dbc2
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/nconf/provider.js
View file

@ -250,7 +250,7 @@ Provider.prototype.get = function (key, callback) {
response = value; response = value;
// Merge objects if necessary // Merge objects if necessary
if (typeof response === 'object' && !Array.isArray(response)) { if (response && typeof response === 'object' && !Array.isArray(response)) {
mergeObjs.push(response); mergeObjs.push(response);
response = undefined; response = undefined;
} }
@ -262,7 +262,7 @@ Provider.prototype.get = function (key, callback) {
response = store.get(key); response = store.get(key);
// Merge objects if necessary // Merge objects if necessary
if (typeof response === 'object' && !Array.isArray(response)) { if (response && typeof response === 'object' && !Array.isArray(response)) {
mergeObjs.push(response); mergeObjs.push(response);
response = undefined; response = undefined;
} }