Skip to content

Fix bug PowerShell returns an exception when listing keys in a vault … #420

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ogail merged 1 commit into from
May 22, 2015
Merged

Fix bug PowerShell returns an exception when listing keys in a vault … #420

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/ResourceManager/KeyVault/Commands.KeyVault/Models/KeyVaultDataServiceClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,8 @@ public IEnumerable<KeyIdentityItem> GetKeys(KeyVaultObjectFilterOptions options)
result = this.keyVaultClient.GetKeysNextAsync(options.NextLink).GetAwaiter().GetResult();

options.NextLink = result.NextLink;
return result.Value.Select((keyItem) => { return new KeyIdentityItem(keyItem, this.vaultUriHelper); });
return (result.Value == null) ? new List<KeyIdentityItem>() :
result.Value.Select((keyItem) => { return new KeyIdentityItem(keyItem, this.vaultUriHelper); });
}
catch (Exception ex)
{
Expand Down Expand Up @@ -349,7 +350,8 @@ public IEnumerable<SecretIdentityItem> GetSecrets(KeyVaultObjectFilterOptions op
result = this.keyVaultClient.GetSecretsNextAsync(options.NextLink).GetAwaiter().GetResult();

options.NextLink = result.NextLink;
return result.Value.Select((secretItem) => { return new SecretIdentityItem(secretItem, this.vaultUriHelper); });
return (result.Value == null) ? new List<SecretIdentityItem>() :
result.Value.Select((secretItem) => { return new SecretIdentityItem(secretItem, this.vaultUriHelper); });
}
catch (Exception ex)
{
Expand Down