Merge pull request #6377 from salachi/TIMOB-16258

TIMOB-16258-Fix comparison code that find the changed properties
tidev · Dec 2, 2014 · 50809c7 · 50809c7
2 parents e19f779 + 386d32b
commit 50809c7
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/ViewItem.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/ViewItem.java
@@ -49,8 +49,9 @@ public KrollDict generateDiffProperties(KrollDict properties) {
 				continue;
 			}
 
-			Object existingVal = this.properties.get(property);			
-			if (existingVal == null || value == null || !existingVal.equals(value)) {
+			Object existingVal = this.properties.get(property);
+			if ((existingVal == null && value != null) || (existingVal != null && value == null)
+				|| (existingVal != null && !existingVal.equals(value))) {
 				applyProperty(property, value);
 			}
 		}