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/NodeI.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/NodeI.cpp')
| -rw-r--r-- | cpp/src/IceGrid/NodeI.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/cpp/src/IceGrid/NodeI.cpp b/cpp/src/IceGrid/NodeI.cpp index 78497aacfc6..2f1281c9286 100644 --- a/cpp/src/IceGrid/NodeI.cpp +++ b/cpp/src/IceGrid/NodeI.cpp @@ -10,7 +10,7 @@ #include <IceUtil/Timer.h> #include <IceUtil/FileUtil.h> #include <Ice/Ice.h> -#include <IcePatch2/Util.h> +#include <IcePatch2Lib/Util.h> #include <IcePatch2/ClientUtil.h> #include <IceGrid/NodeI.h> #include <IceGrid/Activator.h> @@ -22,6 +22,7 @@ using namespace std; using namespace IcePatch2; +using namespace IcePatch2Internal; using namespace IceGrid; namespace @@ -1075,7 +1076,7 @@ NodeI::removeServer(const ServerIPtr& server, const std::string& application) { try { - IcePatch2::removeRecursive(appDir); + IcePatch2Internal::removeRecursive(appDir); } catch(const string& msg) { @@ -1260,8 +1261,8 @@ void NodeI::patch(const FileServerPrx& icepatch, const string& dest, const vector<string>& directories) { IcePatch2::PatcherFeedbackPtr feedback = new LogPatcherFeedback(_traceLevels, dest); - IcePatch2::createDirectory(_dataDir + "/" + dest); - PatcherPtr patcher = new Patcher(icepatch, feedback, _dataDir + "/" + dest, false, 100, 1); + IcePatch2Internal::createDirectory(_dataDir + "/" + dest); + PatcherPtr patcher = PatcherFactory::create(icepatch, feedback, _dataDir + "/" + dest, false, 100, 1); bool aborted = !patcher->prepare(); if(!aborted) { |