From a8b3f056a0b63c71fb1a2659f7b6aebed16889c9 Mon Sep 17 00:00:00 2001
From: Udeesha Gautam <46980425+udeeshagautam@users.noreply.github.com>
Date: Wed, 3 Jul 2019 10:08:14 -0700
Subject: [PATCH] Add only non null changes to difference dictionary to ensure
 index doesnt mismatch (#6236)

---
 extensions/schema-compare/src/schemaCompareResult.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/extensions/schema-compare/src/schemaCompareResult.ts b/extensions/schema-compare/src/schemaCompareResult.ts
index 7facbb3f90..e4e9dc744b 100644
--- a/extensions/schema-compare/src/schemaCompareResult.ts
+++ b/extensions/schema-compare/src/schemaCompareResult.ts
@@ -468,17 +468,19 @@ export class SchemaCompareResult {
 
 	private getAllDifferences(differences: azdata.DiffEntry[]): string[][] {
 		let data = [];
+		let finalDifferences: azdata.DiffEntry[] = [];
 		if (differences) {
 			differences.forEach(difference => {
 				if (difference.differenceType === azdata.SchemaDifferenceType.Object) {
 					if ((difference.sourceValue !== null && difference.sourceValue.length > 0) || (difference.targetValue !== null && difference.targetValue.length > 0)) {
+						finalDifferences.push(difference); // Add only non-null changes to ensure index does not mismatch between dictionay and UI - #6234
 						let state: boolean = this.shouldDiffBeIncluded(difference);
 						data.push([difference.name, this.createName(difference.sourceValue), state, this.SchemaCompareActionMap[difference.updateAction], this.createName(difference.targetValue)]);
 					}
 				}
 			});
 		}
-
+		this.comparisonResult.differences = finalDifferences;
 		return data;
 	}