Skip to content

Commit ce7aaf9

Browse files
author
maddieclayton
committed
Fix ErrorAction issue
1 parent a2f3905 commit ce7aaf9

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

src/Resources/ResourceManager/Implementation/CmdletBase/ResourceManagerCmdletBase.cs

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,8 @@ private void HandleException(ExceptionDispatchInfo capturedException)
423423
var errorResponseException = capturedException.SourceException as ErrorResponseMessageException;
424424
if (errorResponseException != null)
425425
{
426-
this.ThrowTerminatingError(errorResponseException.ToErrorRecord());
426+
this.WriteError(errorResponseException.ToErrorRecord());
427+
return;
427428
}
428429

429430
var aggregateException = capturedException.SourceException as AggregateException;
@@ -435,18 +436,22 @@ private void HandleException(ExceptionDispatchInfo capturedException)
435436
errorResponseException = aggregateException.InnerExceptions.Single() as ErrorResponseMessageException;
436437
if (errorResponseException != null)
437438
{
438-
this.ThrowTerminatingError(errorResponseException.ToErrorRecord());
439+
this.WriteError(errorResponseException.ToErrorRecord());
440+
return;
439441
}
440442

441-
this.ThrowTerminatingError(aggregateException.InnerExceptions.Single().ToErrorRecord());
443+
this.WriteError(aggregateException.InnerExceptions.Single().ToErrorRecord());
444+
return;
442445
}
443446
else
444447
{
445-
this.ThrowTerminatingError(aggregateException.ToErrorRecord());
448+
this.WriteError(aggregateException.ToErrorRecord());
449+
return;
446450
}
447451
}
448452

449-
capturedException.Throw();
453+
this.WriteError(capturedException.SourceException.ToErrorRecord());
454+
return;
450455
}
451456
finally
452457
{

src/Resources/Resources/ChangeLog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
- Additional information about change #1
1919
-->
2020
## Upcoming Release
21+
* Fix for issue https://github.com/Azure/azure-powershell/issues/8235
2122
* Fix incorrect examples in `New-AzADAppCredential` and `New-AzADSpCredential` reference documentation
2223
* Fix issue where path for `-TemplateFile` parameter was not being resolved before executing resource group deployment cmdlets
2324
* Az.Resources: Correct documentation for New-AzureRmPolicyDefinition -Mode default value

0 commit comments

Comments
 (0)