Merge pull request Azure#2918 from rohmano/dev

markcowl · web-flow · commit e21ad18120ea · 2016-09-09T15:41:05.000-07:00
Azure KeyVault: Fix null ref exception while deserializing certificate tags
diff --git a/src/ResourceManager/KeyVault/Commands.KeyVault/Models/CertificateIdentityItem.cs b/src/ResourceManager/KeyVault/Commands.KeyVault/Models/CertificateIdentityItem.cs
@@ -60,7 +60,7 @@ internal CertificateIdentityItem(CertificateBundle certBundle)
             NotBefore = certBundle.Attributes.NotBefore;
             Created = certBundle.Attributes.Created;
             Updated = certBundle.Attributes.Updated;
-            Tags = certBundle.Tags.ConvertToHashtable();
+            Tags = (certBundle.Tags == null) ? null : certBundle.Tags.ConvertToHashtable();
         }
 
         public bool? Enabled { get; set; }

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ internal CertificateIdentityItem(CertificateBundle certBundle)`
`60`	`60`	`NotBefore = certBundle.Attributes.NotBefore;`
`61`	`61`	`Created = certBundle.Attributes.Created;`
`62`	`62`	`Updated = certBundle.Attributes.Updated;`
`63`		`- Tags = certBundle.Tags.ConvertToHashtable();`
	`63`	`+ Tags = (certBundle.Tags == null) ? null : certBundle.Tags.ConvertToHashtable();`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`public bool? Enabled { get; set; }`