diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2006-07-21 15:04:01 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2006-07-21 15:04:01 +0000 |
| commit | 624535eba6e55bbe5ab85d1a6e3e9fde88bb1e99 (patch) | |
| tree | 9c7c69337acbda02b9320b32106445d0956b48f4 /cpp/src/IceGrid/NodeSessionManager.cpp | |
| parent | Initial implementation of the IceGrid registry replication. (diff) | |
| download | ice-624535eba6e55bbe5ab85d1a6e3e9fde88bb1e99.tar.bz2 ice-624535eba6e55bbe5ab85d1a6e3e9fde88bb1e99.tar.xz ice-624535eba6e55bbe5ab85d1a6e3e9fde88bb1e99.zip | |
Win32 fixes
Diffstat (limited to 'cpp/src/IceGrid/NodeSessionManager.cpp')
| -rw-r--r-- | cpp/src/IceGrid/NodeSessionManager.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/cpp/src/IceGrid/NodeSessionManager.cpp b/cpp/src/IceGrid/NodeSessionManager.cpp index 5def24820d6..4e6381c38c9 100644 --- a/cpp/src/IceGrid/NodeSessionManager.cpp +++ b/cpp/src/IceGrid/NodeSessionManager.cpp @@ -62,7 +62,7 @@ NodeSessionKeepAliveThread::run() { session->destroy(); } - catch(const Ice::LocalException& ex) + catch(const Ice::LocalException&) { // // TODO: XXX: TRACE? @@ -125,14 +125,14 @@ NodeSessionKeepAliveThread::keepAlive(const NodeSessionPrx& session) { _node->getTraceLevels()->logger->error("a node with the same name is already registered and active"); } - catch(const Ice::LocalException& ex) + catch(const Ice::LocalException&) { // // TODO: FIX THIS SHOULD BE A TRACE // - ostringstream os; - os << "couldn't contact the IceGrid registry:\n" << ex; - _node->getTraceLevels()->logger->warning(os.str()); +// ostringstream os; +// os << "couldn't contact the IceGrid registry:\n" << ex; +// _node->getTraceLevels()->logger->warning(os.str()); } } @@ -180,11 +180,12 @@ void NodeSessionManager::destroy() { Lock sync(*this); - for(NodeSessionMap::const_iterator p = _sessions.begin(); p != _sessions.end(); ++p) + NodeSessionMap::const_iterator p; + for(p = _sessions.begin(); p != _sessions.end(); ++p) { p->second->terminate(); } - for(NodeSessionMap::const_iterator p = _sessions.begin(); p != _sessions.end(); ++p) + for(p = _sessions.begin(); p != _sessions.end(); ++p) { p->second->getThreadControl().join(); } |