diff options
| author | Tim Sogard <tim+git@lever.co> | 2016-07-20 23:46:12 -0700 |
|---|---|---|
| committer | Jason Carey <jcarey@argv.me> | 2016-07-26 17:22:53 -0400 |
| commit | ad5040e94641e0dcfccbd1d415520281618afde8 (patch) | |
| tree | edfffcf6e857a6476d0ed3941fc467301478d094 /src/mongo | |
| parent | 8f6e2270bb10ea77728eae881c552ce23c7e87f9 (diff) | |
| download | mongo-ad5040e94641e0dcfccbd1d415520281618afde8.tar.gz | |
SERVER-25192 Handle null properties in Object.extend
Closes #1103
Diffstat (limited to 'src/mongo')
| -rw-r--r-- | src/mongo/shell/types.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mongo/shell/types.js b/src/mongo/shell/types.js index 0179dd0a43b..957d018a880 100644 --- a/src/mongo/shell/types.js +++ b/src/mongo/shell/types.js @@ -251,7 +251,7 @@ Array.stdDev = function(arr) { Object.extend = function(dst, src, deep) { for (var k in src) { var v = src[k]; - if (deep && typeof(v) == "object") { + if (deep && typeof(v) == "object" && v !== null) { if (v.constructor === ObjectId) { // convert ObjectId properly eval("v = " + tojson(v)); } else if ("floatApprox" in v) { // convert NumberLong properly |