Fixed issue with nested observables when null is given as property value.

Nedyalko Nikolov · Nedyalko Nikolov · commit cb9d974fba47 · 2016-08-30T13:19:16.000+03:00
diff --git a/tests/app/data/observable-tests.ts b/tests/app/data/observable-tests.ts
@@ -534,4 +534,11 @@ export function test_NestedObservablesWithObservableArrayShouldNotCrash() {
         secondProp: someObservableArray
     });
     TKUnit.assert(testObservable !== undefined);
+}
+
+export function test_NestedObservableWithNullShouldNotCrash() {
+    let testObservable = observable.fromObjectRecursive({
+        someProperty: null
+    });
+    TKUnit.assert(testObservable !== undefined);
 }
diff --git a/tns-core-modules/data/observable/observable.ts b/tns-core-modules/data/observable/observable.ts
@@ -51,9 +51,9 @@ export class Observable implements definition.Observable {
 
     private _observers = {};
 
-    constructor(json?: any) {
-        if (json) {
-            addPropertiesFromJSON(this, json);
+    constructor(source?: any) {
+        if (source) {
+            addPropertiesFromObject(this, source);
         }
     }
 
@@ -249,30 +249,30 @@ export class Observable implements definition.Observable {
     }
 }
 
-function addPropertiesFromJSON(observable: Observable, json: any, recursive?: boolean) {
+function addPropertiesFromObject(observable: Observable, source: any, recursive?: boolean) {
     let isRecursive = recursive || false;
     observable._map = new Map<string, Object>();
-    for (var prop in json) {
-        if (json.hasOwnProperty(prop)) {
+    for (let prop in source) {
+        if (source.hasOwnProperty(prop)) {
             if (isRecursive) {
-                if (!Array.isArray(json[prop]) && typeof json[prop] === 'object' && types.getClass(json[prop]) !== 'ObservableArray') {
-                    json[prop] = fromObjectRecursive(json[prop]);
+                if (!Array.isArray(source[prop]) && source[prop] && typeof source[prop] === 'object' && types.getClass(source[prop]) !== 'ObservableArray') {
+                    source[prop] = fromObjectRecursive(source[prop]);
                 }
             }
             observable._defineNewProperty(prop);
-            observable.set(prop, json[prop]);
+            observable.set(prop, source[prop]);
         }
     }
 }
 
-export function fromObject(json: any): Observable {
+export function fromObject(source: any): Observable {
     let observable = new Observable();
-    addPropertiesFromJSON(observable, json, false);
+    addPropertiesFromObject(observable, source, false);
     return observable;
 }
 
-export function fromObjectRecursive(json: any): Observable {
+export function fromObjectRecursive(source: any): Observable {
     let observable = new Observable();
-    addPropertiesFromJSON(observable, json, true);
+    addPropertiesFromObject(observable, source, true);
     return observable;
 }

Original file line number	Diff line number	Diff line change
`@@ -51,9 +51,9 @@ export class Observable implements definition.Observable {`
`51`	`51`
`52`	`52`	`private _observers = {};`
`53`	`53`
`54`		`- constructor(json?: any) {`
`55`		`- if (json) {`
`56`		`- addPropertiesFromJSON(this, json);`
	`54`	`+ constructor(source?: any) {`
	`55`	`+ if (source) {`
	`56`	`+ addPropertiesFromObject(this, source);`
`57`	`57`	`}`
`58`	`58`	`}`
`59`	`59`
`@@ -249,30 +249,30 @@ export class Observable implements definition.Observable {`
`249`	`249`	`}`
`250`	`250`	`}`
`251`	`251`
`252`		`-function addPropertiesFromJSON(observable: Observable, json: any, recursive?: boolean) {`
	`252`	`+function addPropertiesFromObject(observable: Observable, source: any, recursive?: boolean) {`
`253`	`253`	`let isRecursive = recursive \|\| false;`
`254`	`254`	`observable._map = new Map<string, Object>();`
`255`		`- for (var prop in json) {`
`256`		`- if (json.hasOwnProperty(prop)) {`
	`255`	`+ for (let prop in source) {`
	`256`	`+ if (source.hasOwnProperty(prop)) {`
`257`	`257`	`if (isRecursive) {`
`258`		`- if (!Array.isArray(json[prop]) && typeof json[prop] === 'object' && types.getClass(json[prop]) !== 'ObservableArray') {`
`259`		`- json[prop] = fromObjectRecursive(json[prop]);`
	`258`	`+ if (!Array.isArray(source[prop]) && source[prop] && typeof source[prop] === 'object' && types.getClass(source[prop]) !== 'ObservableArray') {`
	`259`	`+ source[prop] = fromObjectRecursive(source[prop]);`
`260`	`260`	`}`
`261`	`261`	`}`
`262`	`262`	`observable._defineNewProperty(prop);`
`263`		`- observable.set(prop, json[prop]);`
	`263`	`+ observable.set(prop, source[prop]);`
`264`	`264`	`}`
`265`	`265`	`}`
`266`	`266`	`}`
`267`	`267`
`268`		`-export function fromObject(json: any): Observable {`
	`268`	`+export function fromObject(source: any): Observable {`
`269`	`269`	`let observable = new Observable();`
`270`		`- addPropertiesFromJSON(observable, json, false);`
	`270`	`+ addPropertiesFromObject(observable, source, false);`
`271`	`271`	`return observable;`
`272`	`272`	`}`
`273`	`273`
`274`		`-export function fromObjectRecursive(json: any): Observable {`
	`274`	`+export function fromObjectRecursive(source: any): Observable {`
`275`	`275`	`let observable = new Observable();`
`276`		`- addPropertiesFromJSON(observable, json, true);`
	`276`	`+ addPropertiesFromObject(observable, source, true);`
`277`	`277`	`return observable;`
`278`	`278`	`}`