diff options
| -rw-r--r-- | cpp/src/IcePack/Activator.cpp | 7 | ||||
| -rw-r--r-- | cpp/src/IcePack/ServerI.cpp | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/cpp/src/IcePack/Activator.cpp b/cpp/src/IcePack/Activator.cpp index 4250241ce0b..955814632b9 100644 --- a/cpp/src/IcePack/Activator.cpp +++ b/cpp/src/IcePack/Activator.cpp @@ -60,15 +60,16 @@ public: } virtual void - ice_exception(const Ice::Exception&) + ice_exception(const Ice::Exception& ex) { + cerr << ex << endl; _activator->deactivate(_name, 0); } private: const ActivatorPtr _activator; - const string _name; + const string _name; }; } @@ -818,7 +819,7 @@ Activator::deactivate(const string& name, const Ice::ProcessPrx& process) if(_traceLevels->activator > 1) { Ice::Trace out(_traceLevels->logger, _traceLevels->activatorCat); - out << "sent Ctrl+Break to server `" << name << "' (pid = " << pid << ")"; + out << "sent Ctrl+Break to server `" << name << "' (pid = " << pid << ")"; } } else diff --git a/cpp/src/IcePack/ServerI.cpp b/cpp/src/IcePack/ServerI.cpp index d661d32e98c..db715b9ed52 100644 --- a/cpp/src/IcePack/ServerI.cpp +++ b/cpp/src/IcePack/ServerI.cpp @@ -653,7 +653,7 @@ void ServerI::setProcess(const ::Ice::ProcessPrx& proc, const ::Ice::Current&) { IceUtil::Monitor< ::IceUtil::Mutex>::Lock sync(*this); - _process = Ice::ProcessPrx::uncheckedCast(proc->ice_timeout(_waitTime)); + _process = Ice::ProcessPrx::uncheckedCast(proc->ice_timeout(_waitTime * 1000)); notifyAll(); } |