Skip to content

Commit 09a1ded

Browse files
committed
Bug fixes: 1908985, 1907418, 1898689,1901426
1 parent c6a70a3 commit 09a1ded

File tree

3 files changed

+12
-5
lines changed

3 files changed

+12
-5
lines changed

src/ServiceManagement/RemoteApp/Commands.RemoteApp/Collection/GetAzureRemoteAppCollectionUsageDetails.cs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ private void GetPublishedUsageDetails(CollectionUsageDetailsResult detailsUsage)
6262
// The request is async and we have to wait for the usage details to be produced here
6363
do
6464
{
65-
6665
System.Threading.Thread.Sleep(5000);
6766

6867
operationResult = CallClient(() => Client.OperationResults.Get(detailsUsage.UsageDetails.OperationTrackingId), Client.OperationResults);
@@ -98,11 +97,19 @@ private void WriteUsageDetails(CollectionUsageDetailsResult detailsUsage)
9897
try
9998
{
10099
response = (HttpWebResponse)request.GetResponse();
100+
if (response == null)
101+
{
102+
ErrorRecord error = RemoteAppCollectionErrorState.CreateErrorRecordFromString(
103+
"Unable to retrieve Usage data", String.Empty, null, ErrorCategory.InvalidResult);
104+
WriteError(error);
105+
return;
106+
}
101107
}
102108
catch (Exception e)
103109
{
104110
ErrorRecord error = RemoteAppCollectionErrorState.CreateErrorRecordFromException(e, String.Empty, Client.Collections, ErrorCategory.InvalidResult);
105111
WriteError(error);
112+
return;
106113
}
107114

108115
using (Stream dataStream = response.GetResponseStream())

src/ServiceManagement/RemoteApp/Commands.RemoteApp/Commands.RemoteApp.Designer.cs

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/ServiceManagement/RemoteApp/Commands.RemoteApp/Commands.RemoteApp.resx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<root>
33
<!--
44
Microsoft ResX Schema
5-
5+
66
Version 2.0
77
88
The primary goals of this format is to allow a simple XML format
@@ -232,7 +232,7 @@
232232
<value>Publish RemoteApp</value>
233233
</data>
234234
<data name="Publishing" xml:space="preserve">
235-
<value>Publishing Application use Get-Job to view status</value>
235+
<value>Publishing application; use Get-Job to view status</value>
236236
</data>
237237
<data name="UpdateCollection" xml:space="preserve">
238238
<value>Update collection</value>
@@ -241,7 +241,7 @@
241241
<value>No usage found for the requested period.</value>
242242
</data>
243243
<data name="DownloadingUsageDetails" xml:space="preserve">
244-
<value>Retrieving usagedetails</value>
244+
<value>Retrieving usage details</value>
245245
</data>
246246
<data name="RequestFailed" xml:space="preserve">
247247
<value>The request failed.</value>

0 commit comments

Comments
 (0)