Merge pull request #28 from launchdarkly/ag/avoid-access-on-undefined-settings

do not update settings if none were received (likely because a reques…

Author: apucacao

src/index.js

@@ -133,9 +133,14 @@ function connectStream() {
 }
 
 function updateSettings(settings) {
-  var changes = utils.modifications(flags, settings);
-  var keys = Object.keys(changes);
+  var changes;
+  var keys;
 
+  if (!settings) { return; }
+
+  changes = utils.modifications(flags, settings);
+  keys = Object.keys(changes);
+
   flags = settings;
 
   if (useLocalStorage) {
@@ -299,4 +304,4 @@ module.exports = {
 
 if(typeof VERSION !== 'undefined') {
   module.exports.version = VERSION;
-}
+}

src/utils.js

@@ -18,7 +18,7 @@ function clone(obj) {
 
 function modifications(oldObj, newObj) {
   var mods = {};
-  
+  if (!oldObj || !newObj) { return {}; }
   for (var prop in oldObj) {
     if (oldObj.hasOwnProperty(prop)) {
       if (newObj[prop] !== oldObj[prop]) {