Merge branch 'UpdateCmdlets3' into UpdateCmdlets4

robertla · robertla · commit e84ecfe8debb · 2015-03-18T13:06:48.000-07:00
diff --git a/src/ServiceManagement/RemoteApp/Commands.RemoteApp/Collection/GetAzureRemoteAppCollectionUsageDetails.cs b/src/ServiceManagement/RemoteApp/Commands.RemoteApp/Collection/GetAzureRemoteAppCollectionUsageDetails.cs
@@ -96,11 +96,19 @@ private void WriteUsageDetails(CollectionUsageDetailsResult detailsUsage)
             try
             {
                 response = (HttpWebResponse)request.GetResponse();
+                if (response == null)
+                {
+                    ErrorRecord error = RemoteAppCollectionErrorState.CreateErrorRecordFromString(
+                                "Unable to retrieve Usage data", String.Empty, null, ErrorCategory.InvalidResult);
+                    WriteError(error);
+                    return;
+                }
             }
             catch (Exception e)
             {
                 ErrorRecord error = RemoteAppCollectionErrorState.CreateErrorRecordFromException(e, String.Empty, Client.Collections, ErrorCategory.InvalidResult);
                 WriteError(error);
+                return;
             }
 
             using (Stream dataStream = response.GetResponseStream())

Original file line number	Diff line number	Diff line change
`@@ -96,11 +96,19 @@ private void WriteUsageDetails(CollectionUsageDetailsResult detailsUsage)`
`96`	`96`	`try`
`97`	`97`	`{`
`98`	`98`	`response = (HttpWebResponse)request.GetResponse();`
	`99`	`+ if (response == null)`
	`100`	`+ {`
	`101`	`+ ErrorRecord error = RemoteAppCollectionErrorState.CreateErrorRecordFromString(`
	`102`	`+ "Unable to retrieve Usage data", String.Empty, null, ErrorCategory.InvalidResult);`
	`103`	`+ WriteError(error);`
	`104`	`+ return;`
	`105`	`+ }`
`99`	`106`	`}`
`100`	`107`	`catch (Exception e)`
`101`	`108`	`{`
`102`	`109`	`ErrorRecord error = RemoteAppCollectionErrorState.CreateErrorRecordFromException(e, String.Empty, Client.Collections, ErrorCategory.InvalidResult);`
`103`	`110`	`WriteError(error);`
	`111`	`+ return;`
`104`	`112`	`}`
`105`	`113`
`106`	`114`	`using (Stream dataStream = response.GetResponseStream())`