Skip to content

Fix a bug - responding No cause Null Reference exception #149

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
markcowl merged 2 commits into from
Feb 9, 2015
Merged

Fix a bug - responding No cause Null Reference exception #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
283cb7f
Fix bug # 4046713: Responding No to powershell question throws NullRe…
akhadem Feb 5, 2015
16b1b46
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
akhadem Feb 7, 2015
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
12 changes: 6 additions & 6 deletions src/ResourceManager/DataFactories/Commands.DataFactories/Models/DataFactoryClient.Hubs.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,12 @@ public virtual PSHub CreatePSHub(CreatePSHubParameters parameters)
parameters.Name,
parameters.RawJsonContent))
{DataFactoryName = parameters.DataFactoryName, ResourceGroupName = parameters.ResourceGroupName};

if (!DataFactoryCommonUtilities.IsSucceededProvisioningState(hub.ProvisioningState))
{
// ToDo: service side should set the error message for provisioning failures.
throw new ProvisioningFailedException(Resources.HubProvisioningFailed);
}
};

if (parameters.Force)
Expand Down Expand Up @@ -95,12 +101,6 @@ public virtual PSHub CreatePSHub(CreatePSHubParameters parameters)
createHub);
}

if (!DataFactoryCommonUtilities.IsSucceededProvisioningState(hub.ProvisioningState))
{
// ToDo: service side should set the error message for provisioning failures.
throw new ProvisioningFailedException(Resources.HubProvisioningFailed);
}

return hub;
}

Expand Down
16 changes: 8 additions & 8 deletions ...ceManager/DataFactories/Commands.DataFactories/Models/DataFactoryClient.LinkedServices.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,14 @@ public virtual PSLinkedService CreatePSLinkedService(CreatePSLinkedServiceParame
ResourceGroupName = parameters.ResourceGroupName,
DataFactoryName = parameters.DataFactoryName
};

if (!DataFactoryCommonUtilities.IsSucceededProvisioningState(linkedService.ProvisioningState))
{
string errorMessage = linkedService.Properties == null
? string.Empty
: linkedService.Properties.ErrorMessage;
throw new ProvisioningFailedException(errorMessage);
}
};

if (parameters.Force)
Expand Down Expand Up @@ -163,14 +171,6 @@ public virtual PSLinkedService CreatePSLinkedService(CreatePSLinkedServiceParame
createLinkedService);
}

if (!DataFactoryCommonUtilities.IsSucceededProvisioningState(linkedService.ProvisioningState))
{
string errorMessage = linkedService.Properties == null
? string.Empty
: linkedService.Properties.ErrorMessage;
throw new ProvisioningFailedException(errorMessage);
}

return linkedService;
}

Expand Down
16 changes: 8 additions & 8 deletions ...esourceManager/DataFactories/Commands.DataFactories/Models/DataFactoryClient.Pipelines.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,14 @@ public virtual PSPipeline CreatePSPipeline(CreatePSPipelineParameters parameters
ResourceGroupName = parameters.ResourceGroupName,
DataFactoryName = parameters.DataFactoryName
};

if (!DataFactoryCommonUtilities.IsSucceededProvisioningState(pipeline.ProvisioningState))
{
string errorMessage = pipeline.Properties == null
? string.Empty
: pipeline.Properties.ErrorMessage;
throw new ProvisioningFailedException(errorMessage);
}
};

if (parameters.Force)
Expand Down Expand Up @@ -225,14 +233,6 @@ public virtual PSPipeline CreatePSPipeline(CreatePSPipelineParameters parameters
createPipeline);
}

if (!DataFactoryCommonUtilities.IsSucceededProvisioningState(pipeline.ProvisioningState))
{
string errorMessage = pipeline.Properties == null
? string.Empty
: pipeline.Properties.ErrorMessage;
throw new ProvisioningFailedException(errorMessage);
}

return pipeline;
}

Expand Down
16 changes: 8 additions & 8 deletions src/ResourceManager/DataFactories/Commands.DataFactories/Models/DataFactoryClient.Tables.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,14 @@ public virtual PSTable CreatePSTable(CreatePSTableParameters parameters)
ResourceGroupName = parameters.ResourceGroupName,
DataFactoryName = parameters.DataFactoryName
};

if (!DataFactoryCommonUtilities.IsSucceededProvisioningState(table.ProvisioningState))
{
string errorMessage = table.Properties == null
? string.Empty
: table.Properties.ErrorMessage;
throw new ProvisioningFailedException(errorMessage);
}
};

if (parameters.Force)
Expand Down Expand Up @@ -158,14 +166,6 @@ public virtual PSTable CreatePSTable(CreatePSTableParameters parameters)
createTable);
}

if (!DataFactoryCommonUtilities.IsSucceededProvisioningState(table.ProvisioningState))
{
string errorMessage = table.Properties == null
? string.Empty
: table.Properties.ErrorMessage;
throw new ProvisioningFailedException(errorMessage);
}

return table;
}

Expand Down