diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2006-11-28 08:58:39 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2006-11-28 08:58:39 +0000 |
| commit | a686b3fbc49a85a82b44aabc93861ddf39790fdf (patch) | |
| tree | d88d844ee543823a39f1415ba92dff901fc796ce /cpp | |
| parent | Cleanup (diff) | |
| download | ice-a686b3fbc49a85a82b44aabc93861ddf39790fdf.tar.bz2 ice-a686b3fbc49a85a82b44aabc93861ddf39790fdf.tar.xz ice-a686b3fbc49a85a82b44aabc93861ddf39790fdf.zip | |
Win32 fix
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/src/IceGrid/LocatorRegistryI.cpp | 4 | ||||
| -rw-r--r-- | cpp/src/IceGrid/NodeSessionManager.cpp | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/cpp/src/IceGrid/LocatorRegistryI.cpp b/cpp/src/IceGrid/LocatorRegistryI.cpp index ac2bff1828a..1c48a9cd1bb 100644 --- a/cpp/src/IceGrid/LocatorRegistryI.cpp +++ b/cpp/src/IceGrid/LocatorRegistryI.cpp @@ -295,11 +295,11 @@ LocatorRegistryI::setAdapterDirectProxy(const AMI_Adapter_setDirectProxyPtr& ami amiCB->ice_response(); return; } - catch(const AdapterExistsException& ex) + catch(const AdapterExistsException&) { // Continue } - catch(const AdapterNotExistException& ex) + catch(const AdapterNotExistException&) { throw Ice::AdapterNotFoundException(); // Dynamic registration not allowed on the master. } diff --git a/cpp/src/IceGrid/NodeSessionManager.cpp b/cpp/src/IceGrid/NodeSessionManager.cpp index 69485d3cdee..87b9ae17eac 100644 --- a/cpp/src/IceGrid/NodeSessionManager.cpp +++ b/cpp/src/IceGrid/NodeSessionManager.cpp @@ -186,7 +186,6 @@ NodeSessionKeepAliveThread::keepAlive(const NodeSessionPrx& session) catch(const Ice::LocalException& ex) { _node->removeObserver(session); - if(_node->getTraceLevels() && _node->getTraceLevels()->replica > 0) { Ice::Trace out(_node->getTraceLevels()->logger, _node->getTraceLevels()->replicaCat); |