summaryrefslogtreecommitdiff
path: root/cpp/src/IceGrid/SessionI.cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2008-04-23 18:44:58 +0200
committerBenoit Foucher <benoit@zeroc.com>2008-04-23 18:44:58 +0200
commitda521d83cf39731bbdd7b1cce3c325e61c48aeb3 (patch)
tree5c19b2adb08f88a6c480e354908679d5c4efaf68 /cpp/src/IceGrid/SessionI.cpp
parentAdded IceGrid secure demo (diff)
downloadice-da521d83cf39731bbdd7b1cce3c325e61c48aeb3.tar.bz2
ice-da521d83cf39731bbdd7b1cce3c325e61c48aeb3.tar.xz
ice-da521d83cf39731bbdd7b1cce3c325e61c48aeb3.zip
IceGrid Win32 build fix
Diffstat (limited to 'cpp/src/IceGrid/SessionI.cpp')
-rw-r--r--cpp/src/IceGrid/SessionI.cpp8
1 files changed, 4 insertions, 4 deletions
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";