Skip to content

Commit e18baa2

Browse files
committed
Fix NRE
1 parent 7366591 commit e18baa2

File tree

1 file changed

+14
-4
lines changed
  • src/ResourceManager/Resources/Commands.Resources/Models.ResourceGroups

1 file changed

+14
-4
lines changed

src/ResourceManager/Resources/Commands.Resources/Models.ResourceGroups/ResourceClient.cs

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -245,23 +245,33 @@ private void WriteDeploymentProgress(string resourceGroup, string deploymentName
245245

246246
if (operation.Properties.ProvisioningState != ProvisioningState.Failed)
247247
{
248-
statusMessage = string.Format(normalStatusFormat,
248+
if (operation.Properties.TargetResource != null)
249+
{
250+
statusMessage = string.Format(normalStatusFormat,
249251
operation.Properties.TargetResource.ResourceType,
250252
operation.Properties.TargetResource.ResourceName,
251253
operation.Properties.ProvisioningState.ToLower());
252254

253-
WriteVerbose(statusMessage);
255+
WriteVerbose(statusMessage);
256+
}
254257
}
255258
else
256259
{
257260
string errorMessage = ParseErrorMessage(operation.Properties.StatusMessage);
258261

259-
statusMessage = string.Format(failureStatusFormat,
262+
if(operation.Properties.TargetResource != null)
263+
{
264+
statusMessage = string.Format(failureStatusFormat,
260265
operation.Properties.TargetResource.ResourceType,
261266
operation.Properties.TargetResource.ResourceName,
262267
errorMessage);
263268

264-
WriteError(statusMessage);
269+
WriteError(statusMessage);
270+
}
271+
else
272+
{
273+
WriteError(errorMessage);
274+
}
265275

266276
List<string> detailedMessage = ParseDetailErrorMessage(operation.Properties.StatusMessage);
267277

0 commit comments

Comments
 (0)