diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2005-10-25 20:45:35 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2005-10-25 20:45:35 +0000 |
| commit | d89f4f58ea4ab21661540c33f5e3481c67a758b1 (patch) | |
| tree | 4f9a09fb53e573863c29b62d6e7777eb83ee8873 /cpp/src/IceGrid/ServerI.cpp | |
| parent | Fix some SRPM generation bugs, some copy commands and removed buildrequires (diff) | |
| download | ice-d89f4f58ea4ab21661540c33f5e3481c67a758b1.tar.bz2 ice-d89f4f58ea4ab21661540c33f5e3481c67a758b1.tar.xz ice-d89f4f58ea4ab21661540c33f5e3481c67a758b1.zip | |
Fixed a bug where IcePatch2 couldn't be deployed and used in a new
application.
Fixed deadlock.
Added automatic patching after adding an application.
Diffstat (limited to 'cpp/src/IceGrid/ServerI.cpp')
| -rw-r--r-- | cpp/src/IceGrid/ServerI.cpp | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/cpp/src/IceGrid/ServerI.cpp b/cpp/src/IceGrid/ServerI.cpp index 6ceb4875c23..87489ba7167 100644 --- a/cpp/src/IceGrid/ServerI.cpp +++ b/cpp/src/IceGrid/ServerI.cpp @@ -807,7 +807,7 @@ ServerI::stopInternal(bool kill) Ice::ProcessPrx process; if(!kill) { - IceUtil::Monitor< ::IceUtil::Mutex>::Lock sync(*this); + Lock sync(*this); if(!_process && _processRegistered) { while(!_process) @@ -1324,15 +1324,9 @@ ServerI::updateConfigFile(const string& serverDir, const CommunicatorDescriptorP ex.reason = "couldn't create configuration file: " + configFilePath; throw ex; } - for(PropertyDescriptorSeq::const_iterator p = props.begin(); p != props.end(); ++p) { - configfile << p->name; - if(!p->value.empty()) - { - configfile << "=" << p->value; - } - configfile << endl; + configfile << p->name << "=" << p->value << endl; } configfile.close(); } @@ -1409,11 +1403,10 @@ ServerI::toServerState(InternalServerState st) const switch(st) { case ServerI::Inactive: - return IceGrid::Inactive; case ServerI::Activating: + case ServerI::Updating: return IceGrid::Inactive; case ServerI::WaitForActivation: - return IceGrid::Activating; case ServerI::WaitForActivationTimeout: return IceGrid::Activating; case ServerI::Active: |