Do null-checks on context and context.SubsStatuses

Kamran Khan · Kamran Khan · commit 8c284b4d343e · 2016-08-31T11:29:53.000-07:00
diff --git a/src/ResourceManager/Compute/Commands.Compute/Extension/AzureDiskEncryption/GetAzureDiskEncryptionStatus.cs b/src/ResourceManager/Compute/Commands.Compute/Extension/AzureDiskEncryption/GetAzureDiskEncryptionStatus.cs
@@ -162,13 +162,15 @@ private string GetExtensionStatusMessage(OSType currentOSType, bool returnSubsta
 
                 if (returnSubstatusMessage)
                 {
-                    if(context.SubStatuses != null)
+                    if((context == null) ||
+                       (context.SubStatuses == null) ||
+                       (context.SubStatuses.Count < 1))
                     {
-                        return context.SubStatuses[0].Message;
+                        throw new KeyNotFoundException(string.Format(CultureInfo.CurrentUICulture, "Invalid extension substatus"));
                     }
                     else
                     {
-                        throw new KeyNotFoundException(string.Format(CultureInfo.CurrentUICulture, "Invalid extension substatus"));
+                        return context.SubStatuses[0].Message;
                     }
                 }
 

Original file line number	Diff line number	Diff line change
`@@ -162,13 +162,15 @@ private string GetExtensionStatusMessage(OSType currentOSType, bool returnSubsta`
`162`	`162`
`163`	`163`	`if (returnSubstatusMessage)`
`164`	`164`	`{`
`165`		`- if(context.SubStatuses != null)`
	`165`	`+ if((context == null) \|\|`
	`166`	`+ (context.SubStatuses == null) \|\|`
	`167`	`+ (context.SubStatuses.Count < 1))`
`166`	`168`	`{`
`167`		`- return context.SubStatuses[0].Message;`
	`169`	`+ throw new KeyNotFoundException(string.Format(CultureInfo.CurrentUICulture, "Invalid extension substatus"));`
`168`	`170`	`}`
`169`	`171`	`else`
`170`	`172`	`{`
`171`		`- throw new KeyNotFoundException(string.Format(CultureInfo.CurrentUICulture, "Invalid extension substatus"));`
	`173`	`+ return context.SubStatuses[0].Message;`
`172`	`174`	`}`
`173`	`175`	`}`
`174`	`176`