diff options
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/src/IceGrid/DescriptorHelper.cpp | 3 | ||||
| -rw-r--r-- | cpp/src/IceGrid/ServerI.cpp | 10 |
2 files changed, 6 insertions, 7 deletions
diff --git a/cpp/src/IceGrid/DescriptorHelper.cpp b/cpp/src/IceGrid/DescriptorHelper.cpp index cc83e568b65..a290c29f2b9 100644 --- a/cpp/src/IceGrid/DescriptorHelper.cpp +++ b/cpp/src/IceGrid/DescriptorHelper.cpp @@ -1570,7 +1570,8 @@ ServerInstanceHelper::ServerInstanceHelper(const ServerInstanceDescriptor& desc, ServerInstanceHelper::ServerInstanceHelper(const ServerDescriptorPtr& definition, const Resolver& resolve, - bool instantiate) + bool instantiate) : + _def(ServerInstanceDescriptor()) { init(definition, resolve, instantiate); } diff --git a/cpp/src/IceGrid/ServerI.cpp b/cpp/src/IceGrid/ServerI.cpp index 08b8015d2cd..74d2db36c8b 100644 --- a/cpp/src/IceGrid/ServerI.cpp +++ b/cpp/src/IceGrid/ServerI.cpp @@ -2318,9 +2318,8 @@ ServerI::updateConfigFile(const string& serverDir, const CommunicatorDescriptorP } } - ofstream configfile; - configfile.open(configFilePath.c_str(), ios::out); - if(!configfile) + ofstream configfile(configFilePath.c_str()); + if(!configfile.good()) { throw "couldn't create configuration file: " + configFilePath; } @@ -2351,9 +2350,8 @@ ServerI::updateDbEnv(const string& serverDir, const DbEnvDescriptor& dbEnv) if(!dbEnv.properties.empty()) { string file = dbEnvHome + "/DB_CONFIG"; - ofstream configfile; - configfile.open(file.c_str(), ios::out); - if(!configfile) + ofstream configfile(file.c_str()); + if(!configfile.good()) { throw "couldn't create configuration file `" + file + "'"; } |