summaryrefslogtreecommitdiff
path: root/cpp/src/IceGrid/Parser.cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2005-07-06 10:57:39 +0000
committerBenoit Foucher <benoit@zeroc.com>2005-07-06 10:57:39 +0000
commit5dcdcde597b97f12d63c519cc6b7cb83c3820035 (patch)
tree60c0cd0779ecf7d61836ff8caf4fa3cca545dd0e /cpp/src/IceGrid/Parser.cpp
parentrelease reference to servant asap (diff)
downloadice-5dcdcde597b97f12d63c519cc6b7cb83c3820035.tar.bz2
ice-5dcdcde597b97f12d63c519cc6b7cb83c3820035.tar.xz
ice-5dcdcde597b97f12d63c519cc6b7cb83c3820035.zip
Changed server start to wait for object adapter activation before to
return.
Diffstat (limited to 'cpp/src/IceGrid/Parser.cpp')
-rw-r--r--cpp/src/IceGrid/Parser.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/cpp/src/IceGrid/Parser.cpp b/cpp/src/IceGrid/Parser.cpp
index 90ff363e2ee..d0e5e986743 100644
--- a/cpp/src/IceGrid/Parser.cpp
+++ b/cpp/src/IceGrid/Parser.cpp
@@ -179,7 +179,14 @@ describeServer(Output& out, const Ice::CommunicatorPtr& communicator, const Serv
out << nl << "pwd = '" << server->pwd << "'";
}
out << nl << "activation = '" << server->activation << "'";
-
+ if(server->activationTimeout > 0)
+ {
+ out << nl << "activationTimeout = " << server->activationTimeout;
+ }
+ if(server->deactivationTimeout > 0)
+ {
+ out << nl << "deactivationTimeout = " << server->deactivationTimeout;
+ }
if(!server->interpreterOptions.empty())
{
out << nl << "interpreterOptions = '" << toString(server->interpreterOptions) << "'";