summaryrefslogtreecommitdiff
path: root/cpp/src/IcePatch/FileLocator.cpp
diff options
context:
space:
mode:
authorMarc Laukien <marc@zeroc.com>2003-12-11 16:01:20 +0000
committerMarc Laukien <marc@zeroc.com>2003-12-11 16:01:20 +0000
commitb0b5166f2f0f55894932f77b803b7ea797cc5baa (patch)
tree145de22439461bdefd14a72a1f9dc22ac15bcf3a /cpp/src/IcePatch/FileLocator.cpp
parentthe icepatch server now doesn't chdir anymore (diff)
downloadice-b0b5166f2f0f55894932f77b803b7ea797cc5baa.tar.bz2
ice-b0b5166f2f0f55894932f77b803b7ea797cc5baa.tar.xz
ice-b0b5166f2f0f55894932f77b803b7ea797cc5baa.zip
the icepatch server now doesn't chdir anymore
Diffstat (limited to 'cpp/src/IcePatch/FileLocator.cpp')
-rw-r--r--cpp/src/IcePatch/FileLocator.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/cpp/src/IcePatch/FileLocator.cpp b/cpp/src/IcePatch/FileLocator.cpp
index 4fca6e31b01..5c36d962e00 100644
--- a/cpp/src/IcePatch/FileLocator.cpp
+++ b/cpp/src/IcePatch/FileLocator.cpp
@@ -25,8 +25,13 @@ IcePatch::FileLocator::FileLocator(const Ice::ObjectAdapterPtr& adapter) :
_regular(new RegularI(adapter)),
_logger(adapter->getCommunicator()->getLogger()),
_fileTraceLogger(adapter->getCommunicator()->getProperties()->getPropertyAsInt("IcePatch.Trace.Files") > 0 ?
- _logger : LoggerPtr())
+ _logger : LoggerPtr()),
+ _dir(adapter->getCommunicator()->getProperties()->getProperty("IcePatch.Directory"))
{
+ if(!_dir.empty() && _dir[_dir.length() - 1] != '/')
+ {
+ const_cast<string&>(_dir) += '/';
+ }
}
ObjectPtr
@@ -71,7 +76,7 @@ IcePatch::FileLocator::locate(const Current& current, LocalObjectPtr&)
FileInfo info;
try
{
- info = getFileInfo(path, true, _fileTraceLogger);
+ info = getFileInfo(_dir + path, true, _fileTraceLogger);
}
catch(const FileAccessException& ex)
{