diff options
Diffstat (limited to 'cpp/src/IceGrid/NodeCache.cpp')
| -rw-r--r-- | cpp/src/IceGrid/NodeCache.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/cpp/src/IceGrid/NodeCache.cpp b/cpp/src/IceGrid/NodeCache.cpp index cfefc48eedd..023f677d1a1 100644 --- a/cpp/src/IceGrid/NodeCache.cpp +++ b/cpp/src/IceGrid/NodeCache.cpp @@ -204,11 +204,11 @@ public: } void - exception(const Ice::Exception& ex) + exception(const Ice::Exception& lex) { try { - ex.ice_throw(); + lex.ice_throw(); } catch(const DeploymentException& ex) { @@ -266,11 +266,11 @@ public: } void - exception(const Ice::Exception& ex) + exception(const Ice::Exception& dex) { try { - ex.ice_throw(); + dex.ice_throw(); } catch(const DeploymentException& ex) { @@ -389,18 +389,18 @@ NodeEntry::setSession(const NodeSessionIPtr& session) } else { - NodeSessionIPtr session = _session; + NodeSessionIPtr s = _session; sync.release(); try { - session->getNode()->ice_ping(); + s->getNode()->ice_ping(); throw NodeActiveException(); } catch(const Ice::LocalException&) { try { - session->destroy(Ice::emptyCurrent); + s->destroy(Ice::emptyCurrent); } catch(const Ice::ObjectNotExistException&) { |