diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2008-06-06 12:46:58 -0230 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2008-06-06 17:54:49 +0200 |
| commit | a9169f12e8417b91a7dcfea3b678d09ed2697b62 (patch) | |
| tree | 2e072cc1d8319a7ce213590e9e15c719f5b29ab9 /cpp/src/IceGrid/ServerI.cpp | |
| parent | - Fixed bug 3242 (diff) | |
| download | ice-a9169f12e8417b91a7dcfea3b678d09ed2697b62.tar.bz2 ice-a9169f12e8417b91a7dcfea3b678d09ed2697b62.tar.xz ice-a9169f12e8417b91a7dcfea3b678d09ed2697b62.zip | |
Bug 3014 - isAbsolute incorrect
Diffstat (limited to 'cpp/src/IceGrid/ServerI.cpp')
| -rw-r--r-- | cpp/src/IceGrid/ServerI.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cpp/src/IceGrid/ServerI.cpp b/cpp/src/IceGrid/ServerI.cpp index c9b7afad093..c033ff18817 100644 --- a/cpp/src/IceGrid/ServerI.cpp +++ b/cpp/src/IceGrid/ServerI.cpp @@ -18,6 +18,7 @@ #include <IcePatch2/Util.h> #include <IcePatch2/OS.h> +#include <IceUtil/FileUtil.h> #include <sys/types.h> #include <sys/stat.h> @@ -2027,7 +2028,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); - if(IcePatch2::isAbsolute(path)) + if(IceUtilInternal::isAbsolutePath(path)) { _logs.push_back(path); } @@ -2714,7 +2715,7 @@ ServerI::getFilePath(const string& filename) const else if(!filename.empty() && filename[0] == '#') { string path = IcePatch2::simplify(filename.substr(1)); - if(!IcePatch2::isAbsolute(path)) + if(!IceUtilInternal::isAbsolutePath(path)) { path = _node->getPlatformInfo().getCwd() + "/" + path; } |