diff options
| author | Jose <jose@zeroc.com> | 2015-02-17 17:08:54 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2015-02-17 17:08:54 +0100 |
| commit | 21c1ba295bc813f35a638b3867234c63dac1816e (patch) | |
| tree | d4e82f25daf0030375094f734cf4c5ad2d55fdf2 /cpp/src/IceGrid/ServerI.cpp | |
| parent | ICE-6306 added checks to javascript for byte/short/int (diff) | |
| download | ice-21c1ba295bc813f35a638b3867234c63dac1816e.tar.bz2 ice-21c1ba295bc813f35a638b3867234c63dac1816e.tar.xz ice-21c1ba295bc813f35a638b3867234c63dac1816e.zip | |
Fixed (ICE-5740) - IcePatch2 has issues with 'large' files.
Diffstat (limited to 'cpp/src/IceGrid/ServerI.cpp')
| -rw-r--r-- | cpp/src/IceGrid/ServerI.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/cpp/src/IceGrid/ServerI.cpp b/cpp/src/IceGrid/ServerI.cpp index 2fb917d9190..34f0030d790 100644 --- a/cpp/src/IceGrid/ServerI.cpp +++ b/cpp/src/IceGrid/ServerI.cpp @@ -18,7 +18,7 @@ #include <IceGrid/ServerAdapterI.h> #include <IceGrid/DescriptorHelper.h> -#include <IcePatch2/Util.h> +#include <IcePatch2Lib/Util.h> #include <IceUtil/FileUtil.h> #include <sys/types.h> @@ -1889,7 +1889,7 @@ ServerI::destroy() { try { - IcePatch2::removeRecursive(_serverDir); + IcePatch2Internal::removeRecursive(_serverDir); } catch(const string& msg) { @@ -2049,7 +2049,7 @@ ServerI::update() // try { - IcePatch2::removeRecursive(_serverDir); + IcePatch2Internal::removeRecursive(_serverDir); } catch(const string&) { @@ -2270,7 +2270,7 @@ ServerI::updateImpl(const InternalServerDescriptorPtr& descriptor) // for(Ice::StringSeq::const_iterator p = _desc->logs.begin(); p != _desc->logs.end(); ++p) { - string path = IcePatch2::simplify(*p); + string path = IcePatch2Internal::simplify(*p); if(IceUtilInternal::isAbsolutePath(path)) { _logs.push_back(path); @@ -2348,7 +2348,7 @@ ServerI::updateImpl(const InternalServerDescriptorPtr& descriptor) // // Remove old configuration files. // - Ice::StringSeq files = IcePatch2::readDirectory(_serverDir + "/config"); + Ice::StringSeq files = IcePatch2Internal::readDirectory(_serverDir + "/config"); Ice::StringSeq toDel; set_difference(files.begin(), files.end(), knownFiles.begin(), knownFiles.end(), back_inserter(toDel)); for(Ice::StringSeq::const_iterator q = toDel.begin(); q != toDel.end(); ++q) @@ -2357,7 +2357,7 @@ ServerI::updateImpl(const InternalServerDescriptorPtr& descriptor) { try { - IcePatch2::remove(_serverDir + "/config/" + *q); + IcePatch2Internal::remove(_serverDir + "/config/" + *q); } catch(const string& msg) { @@ -2412,14 +2412,14 @@ ServerI::updateImpl(const InternalServerDescriptorPtr& descriptor) // // Remove old database environments. // - Ice::StringSeq dbEnvs = IcePatch2::readDirectory(_serverDir + "/dbs"); + Ice::StringSeq dbEnvs = IcePatch2Internal::readDirectory(_serverDir + "/dbs"); Ice::StringSeq toDel; set_difference(dbEnvs.begin(), dbEnvs.end(), knownDbEnvs.begin(), knownDbEnvs.end(), back_inserter(toDel)); for(Ice::StringSeq::const_iterator p = toDel.begin(); p != toDel.end(); ++p) { try { - IcePatch2::removeRecursive(_serverDir + "/dbs/" + *p); + IcePatch2Internal::removeRecursive(_serverDir + "/dbs/" + *p); } catch(const string& msg) { @@ -3047,7 +3047,7 @@ ServerI::createOrUpdateDirectory(const string& dir) { try { - IcePatch2::createDirectory(dir); + IcePatch2Internal::createDirectory(dir); } catch(const string&) { @@ -3148,7 +3148,7 @@ ServerI::getFilePath(const string& filename) const } else if(!filename.empty() && filename[0] == '#') { - string path = IcePatch2::simplify(filename.substr(1)); + string path = IcePatch2Internal::simplify(filename.substr(1)); if(!IceUtilInternal::isAbsolutePath(path)) { path = _node->getPlatformInfo().getCwd() + "/" + path; |