Skip to content
Snippets Groups Projects

F remove boost rdep

Merged Timm Fitschen requested to merge f-remove-boost-rdep into dev
2 files
+ 3
3
Compare changes
  • Side-by-side
  • Inline
Files
2
@@ -468,7 +468,7 @@ auto ConfigurationManager::InitializeDefaults() -> int { // NOLINT
}
// Logging in the configuration leads to additional content.
if (WRAPPED_JSON_CONFIGURATION(this)->is_object() &&
if (!this->json_configuration.IsNull() && WRAPPED_JSON_CONFIGURATION(this)->is_object() &&
WRAPPED_JSON_CONFIGURATION(this)->as_object().contains("logging")) {
LoggingConfiguration logging_configuration =
CreateLoggingConfiguration(WRAPPED_JSON_CONFIGURATION(this)->at("logging").as_object());
@@ -479,7 +479,7 @@ auto ConfigurationManager::InitializeDefaults() -> int { // NOLINT
"We are using the default configuration";
}
if (configuration_file_path != nullptr && WRAPPED_JSON_CONFIGURATION(this)->is_object()) {
if (configuration_file_path != nullptr && !this->json_configuration.IsNull() && WRAPPED_JSON_CONFIGURATION(this)->is_object() {
CAOSDB_LOG_INFO(logger_name) << "Loaded configuration from " << *(configuration_file_path)
<< ".";
}
Loading