Merge pull request #3017 from michaelcohenmicrosoft/dev

markcowl · web-flow · commit c85ce8020406 · 2016-10-10T17:16:09.000-07:00
Add additional check to prevent null-reference exception
diff --git a/src/ResourceManager/Compute/Commands.Compute/Extension/SqlServer/SetAzureVMSqlServerExtensionCommand.cs b/src/ResourceManager/Compute/Commands.Compute/Extension/SqlServer/SetAzureVMSqlServerExtensionCommand.cs
@@ -102,7 +102,7 @@ public override void ExecuteCmdlet()
 
 
             VirtualMachine vm = ComputeClient.ComputeManagementClient.VirtualMachines.Get(this.ResourceGroupName, this.VMName);
-            if (vm != null)
+            if (vm != null && vm.Resources != null)
             {
                 VirtualMachineExtension extension = vm.Resources.Where(x => x.Publisher.Equals(VirtualMachineSqlServerExtensionContext.ExtensionPublishedNamespace)).FirstOrDefault();
                 if (extension != null)

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ public override void ExecuteCmdlet()`
`102`	`102`
`103`	`103`
`104`	`104`	`VirtualMachine vm = ComputeClient.ComputeManagementClient.VirtualMachines.Get(this.ResourceGroupName, this.VMName);`
`105`		`- if (vm != null)`
	`105`	`+ if (vm != null && vm.Resources != null)`
`106`	`106`	`{`
`107`	`107`	`VirtualMachineExtension extension = vm.Resources.Where(x => x.Publisher.Equals(VirtualMachineSqlServerExtensionContext.ExtensionPublishedNamespace)).FirstOrDefault();`
`108`	`108`	`if (extension != null)`