ayan.poddar/eShopOnContainers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove try catch

Browse Source
This commit is contained in:
Erik Pique 2018-12-17 14:47:19 +01:00
parent 121c62e500
commit 4362eb0dce
2 changed files with 18 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ServiceFabric/Linux/eShopOnServiceFabricApiGateWays/ApiGw_Base/Controllers/ConfigurationController.cs
View File

@ -24,25 +24,18 @@ namespace ApiGw_Base.Controllers
private IActionResult ReadConfigurationFile(ConfigurationType configurationType, ConfigurationBffType configurationBffType)
{
try
{
var path = $"{AppDomain.CurrentDomain.BaseDirectory}/Configurations/configuration.{configurationType}.Bff.{configurationBffType}.json";
var path = $"{AppDomain.CurrentDomain.BaseDirectory}/Configurations/configuration.{configurationType}.Bff.{configurationBffType}.json";
using (var streamReader = new StreamReader(path, Encoding.UTF8))
using (var streamReader = new StreamReader(path, Encoding.UTF8))
{
var jsonString = streamReader.ReadToEnd();
if (string.IsNullOrWhiteSpace(jsonString))
{
var jsonString = streamReader.ReadToEnd();
if (string.IsNullOrWhiteSpace(jsonString))
{
return BadRequest($"Configuration file 'configuration.{configurationType}.Bff.{configurationBffType}.json' not found");
}
return Ok(jsonString);
return BadRequest($"Configuration file 'configuration.{configurationType}.Bff.{configurationBffType}.json' not found");
}
}
catch (Exception exception)
{
return BadRequest(exception.Message);
return Ok(jsonString);
}
}
}

25
ServiceFabric/Windows/eShopOnServiceFabricApiGateWays/eShopOnServiceFabricApiGW/ApiGw_Base/Controllers/ConfigurationController.cs
View File

@ -24,25 +24,18 @@ namespace ApiGw_Base.Controllers
private IActionResult ReadConfigurationFile(ConfigurationType configurationType, ConfigurationBffType configurationBffType)
{
try
{
var path = $"{AppDomain.CurrentDomain.BaseDirectory}/Configurations/configuration.{configurationType}.Bff.{configurationBffType}.json";
var path = $"{AppDomain.CurrentDomain.BaseDirectory}/Configurations/configuration.{configurationType}.Bff.{configurationBffType}.json";
using (var streamReader = new StreamReader(path, Encoding.UTF8))
using (var streamReader = new StreamReader(path, Encoding.UTF8))
{
var jsonString = streamReader.ReadToEnd();
if (string.IsNullOrWhiteSpace(jsonString))
{
var jsonString = streamReader.ReadToEnd();
if (string.IsNullOrWhiteSpace(jsonString))
{
return BadRequest($"Configuration file 'configuration.{configurationType}.Bff.{configurationBffType}.json' not found");
}
return Ok(jsonString);
return BadRequest($"Configuration file 'configuration.{configurationType}.Bff.{configurationBffType}.json' not found");
}
}
catch (Exception exception)
{
return BadRequest(exception.Message);
return Ok(jsonString);
}
}
}