From 20dc0bd7d3e323d706ac0a1749613ce5c67eca62 Mon Sep 17 00:00:00 2001
From: Panayot Cankov <Panayot.Cankov@telerik.com>
Date: Thu, 9 Jun 2016 16:08:53 +0300
Subject: [PATCH] Fix setting src on async image mismatching imageSource

---
 tests/app/testRunner.ts                   | 2 +-
 tns-core-modules/ui/image/image-common.ts | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/app/testRunner.ts b/tests/app/testRunner.ts
index 25ed90bb0..f89ddb7bd 100644
--- a/tests/app/testRunner.ts
+++ b/tests/app/testRunner.ts
@@ -156,7 +156,7 @@ function printRunTestStats() {
     let finalMessage = `\n=== ALL TESTS COMPLETE ===\n` +
         `${(allTests.length - failedTestCount)} OK, ${failedTestCount} failed\n` + 
         `DURATION: ${totalTime} ms\n`;
-    TKUnit.write(finalMessage, messageType.info); 
+    TKUnit.write(finalMessage, messageType.info);  
 
     for (j = 0; j < failedTestInfo.length; j++) {
         let failureMessage = failedTestInfo[j];
diff --git a/tns-core-modules/ui/image/image-common.ts b/tns-core-modules/ui/image/image-common.ts
index 406aa79c2..a86052fdc 100644
--- a/tns-core-modules/ui/image/image-common.ts
+++ b/tns-core-modules/ui/image/image-common.ts
@@ -97,7 +97,8 @@ export class Image extends view.View implements definition.Image {
 
             var source = new imageSource.ImageSource();
             var imageLoaded = () => {
-                if (value !== this.src) {
+                let currentValue = this.src;
+                if (!types.isString(this.src) || value !== currentValue.trim()) {
                     return;
                 }
                 this.imageSource = source;