diff options
| author | Bernard Normier <bernard@zeroc.com> | 2008-05-09 10:40:09 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2008-05-09 10:40:09 -0400 |
| commit | 240f2fc68b04cd5637e16811bb350267410b30fb (patch) | |
| tree | e5472cb7cf3808d14c33e22487cad02009fe1cba /cpp/src/IceGrid/NodeCache.cpp | |
| parent | Added missing service_running.png (diff) | |
| parent | Bug 3119 - no local copy of dll for projects (diff) | |
| download | ice-240f2fc68b04cd5637e16811bb350267410b30fb.tar.bz2 ice-240f2fc68b04cd5637e16811bb350267410b30fb.tar.xz ice-240f2fc68b04cd5637e16811bb350267410b30fb.zip | |
Merge branch 'master' of cvs:/home/git/ice
Diffstat (limited to 'cpp/src/IceGrid/NodeCache.cpp')
| -rw-r--r-- | cpp/src/IceGrid/NodeCache.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cpp/src/IceGrid/NodeCache.cpp b/cpp/src/IceGrid/NodeCache.cpp index 5bdb1e12b75..812cb1977df 100644 --- a/cpp/src/IceGrid/NodeCache.cpp +++ b/cpp/src/IceGrid/NodeCache.cpp @@ -932,7 +932,8 @@ NodeEntry::getInternalServerDescriptor(const ServerInfo& info) const { ServiceDescriptorPtr s = p->descriptor; const string path = _session->getInfo()->dataDir + "/servers/" + server->id + "/config/config_" + s->name; - props.push_back(createProperty("IceBox.Service." + s->name, s->entry + " --Ice.Config=\"" + path + "\"")); + props.push_back(createProperty("IceBox.Service." + s->name, s->entry + " --Ice.Config='" + + escapeProperty(path) + "'")); servicesStr += s->name + " "; } if(!hasProperty(info.descriptor->propertySet.properties, "IceBox.InstanceName")) |