diff options
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/IceGrid/AdminSessionI.cpp | 8 | ||||
| -rw-r--r-- | cpp/src/IceGrid/SessionI.cpp | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/cpp/src/IceGrid/AdminSessionI.cpp b/cpp/src/IceGrid/AdminSessionI.cpp index a486629d5d0..268f4f76ff6 100644 --- a/cpp/src/IceGrid/AdminSessionI.cpp +++ b/cpp/src/IceGrid/AdminSessionI.cpp @@ -431,12 +431,12 @@ AdminSessionFactory::createGlacier2Session(const string& sessionId, const Glacie } timeout = ctl->getSessionTimeout(); } - catch(const Ice::LocalException& ex) + catch(const Ice::LocalException& e) { session->destroy(Ice::Current()); Ice::Warning out(_database->getTraceLevels()->logger); - out << "Failed to callback Glacier2 session control object:\n" << ex; + out << "Failed to callback Glacier2 session control object:\n" << e; Glacier2::CannotCreateSessionException ex; ex.reason = "internal server error"; @@ -487,11 +487,11 @@ AdminSSLSessionManagerI::create(const Glacier2::SSLInfo& info, IceSSL::CertificatePtr cert = IceSSL::Certificate::decode(info.certs[0]); userDN = cert->getSubjectDN(); } - catch(const Ice::Exception& ex) + catch(const Ice::Exception& e) { // This shouldn't happen, the SSLInfo is supposed to be encoded by Glacier2. Ice::Error out(_factory->getTraceLevels()->logger); - out << "SSL session manager couldn't decode SSL certificates:\n" << ex; + out << "SSL session manager couldn't decode SSL certificates:\n" << e; Glacier2::CannotCreateSessionException ex; ex.reason = "internal server error"; diff --git a/cpp/src/IceGrid/SessionI.cpp b/cpp/src/IceGrid/SessionI.cpp index 8cc681ba469..79bbda120e1 100644 --- a/cpp/src/IceGrid/SessionI.cpp +++ b/cpp/src/IceGrid/SessionI.cpp @@ -333,12 +333,12 @@ ClientSessionFactory::createGlacier2Session(const string& sessionId, const Glaci } timeout = ctl->getSessionTimeout(); } - catch(const Ice::LocalException& ex) + catch(const Ice::LocalException& e) { session->destroy(Ice::Current()); Ice::Warning out(_database->getTraceLevels()->logger); - out << "Failed to callback Glacier2 session control object:\n" << ex; + out << "Failed to callback Glacier2 session control object:\n" << e; Glacier2::CannotCreateSessionException ex; ex.reason = "internal server error"; @@ -389,11 +389,11 @@ ClientSSLSessionManagerI::create(const Glacier2::SSLInfo& info, IceSSL::CertificatePtr cert = IceSSL::Certificate::decode(info.certs[0]); userDN = cert->getSubjectDN(); } - catch(const Ice::Exception& ex) + catch(const Ice::Exception& e) { // This shouldn't happen, the SSLInfo is supposed to be encoded by Glacier2. Ice::Error out(_factory->getTraceLevels()->logger); - out << "SSL session manager couldn't decode SSL certificates:\n" << ex; + out << "SSL session manager couldn't decode SSL certificates:\n" << e; Glacier2::CannotCreateSessionException ex; ex.reason = "internal server error"; |