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/ServerI.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/ServerI.cpp')
| -rw-r--r-- | cpp/src/IceGrid/ServerI.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/IceGrid/ServerI.cpp b/cpp/src/IceGrid/ServerI.cpp index 4dc1d241882..acb22747b52 100644 --- a/cpp/src/IceGrid/ServerI.cpp +++ b/cpp/src/IceGrid/ServerI.cpp @@ -1368,7 +1368,7 @@ ServerI::activate() // Ice::StringSeq options; copy(desc->options.begin(), desc->options.end(), back_inserter(options)); - options.push_back("--Ice.Config=" + _serverDir + "/config/config"); + options.push_back("--Ice.Config=" + escapeProperty(_serverDir + "/config/config")); Ice::StringSeq envs; transform(desc->envs.begin(), desc->envs.end(), back_inserter(envs), EnvironmentEval()); @@ -2143,7 +2143,7 @@ ServerI::updateImpl(const InternalServerDescriptorPtr& descriptor) } else { - configfile << r->name << "=" << r->value << endl; + configfile << escapeProperty(r->name) << "=" << escapeProperty(r->value) << endl; } } configfile.close(); |