diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2015-11-17 08:46:56 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2015-11-17 08:46:56 +0100 |
| commit | 9da93c90ccdc2430ce57b6eff59cdae4c919cf0e (patch) | |
| tree | e7049bef3e36b073bae5dbb44b0ff671b70f0bf0 /cpp/src/IceGrid/ServerI.cpp | |
| parent | Removed filelock test (moved to freeze repo) (diff) | |
| download | ice-9da93c90ccdc2430ce57b6eff59cdae4c919cf0e.tar.bz2 ice-9da93c90ccdc2430ce57b6eff59cdae4c919cf0e.tar.xz ice-9da93c90ccdc2430ce57b6eff59cdae4c919cf0e.zip | |
Fixed ICE-6887 - Removed IceGrid createOrUpdateDirectory
Diffstat (limited to 'cpp/src/IceGrid/ServerI.cpp')
| -rw-r--r-- | cpp/src/IceGrid/ServerI.cpp | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/cpp/src/IceGrid/ServerI.cpp b/cpp/src/IceGrid/ServerI.cpp index 7fcc644b987..b5da40d73a1 100644 --- a/cpp/src/IceGrid/ServerI.cpp +++ b/cpp/src/IceGrid/ServerI.cpp @@ -2305,10 +2305,10 @@ ServerI::updateImpl(const InternalServerDescriptorPtr& descriptor) // // Create or update the server directories exists. // - createOrUpdateDirectory(_serverDir); - createOrUpdateDirectory(_serverDir + "/config"); - createOrUpdateDirectory(_serverDir + "/dbs"); - createOrUpdateDirectory(_serverDir + "/distrib"); + IcePatch2Internal::createDirectory(_serverDir); + IcePatch2Internal::createDirectory(_serverDir + "/config"); + IcePatch2Internal::createDirectory(_serverDir + "/dbs"); + IcePatch2Internal::createDirectory(_serverDir + "/distrib"); // // Create the configuration files, remove the old ones. @@ -2379,7 +2379,7 @@ ServerI::updateImpl(const InternalServerDescriptorPtr& descriptor) knownDbEnvs.push_back((*q)->name); string dbEnvHome = _serverDir + "/dbs/" + (*q)->name; - createOrUpdateDirectory(dbEnvHome); + IcePatch2Internal::createDirectory(dbEnvHome); if(!(*q)->properties.empty()) { @@ -3042,18 +3042,6 @@ ServerI::setStateNoSync(InternalServerState st, const std::string& reason) } } -void -ServerI::createOrUpdateDirectory(const string& dir) -{ - try - { - IcePatch2Internal::createDirectory(dir); - } - catch(const string&) - { - } -} - ServerState ServerI::toServerState(InternalServerState st) const { |