diff options
| author | Bernard Normier <bernard@zeroc.com> | 2017-03-08 19:37:13 -0500 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2017-03-08 19:37:13 -0500 |
| commit | 11678336dea1f3676881b87bbe8ca3e3cb6b5296 (patch) | |
| tree | ec4bbc16d9fdfe1f9c48f374f26169ba4e88cb3a /cpp/src/IceGrid/NodeCache.cpp | |
| parent | Python thread hook fixes (diff) | |
| download | ice-11678336dea1f3676881b87bbe8ca3e3cb6b5296.tar.bz2 ice-11678336dea1f3676881b87bbe8ca3e3cb6b5296.tar.xz ice-11678336dea1f3676881b87bbe8ca3e3cb6b5296.zip | |
Removed Current's default value in the C++11 mapping
Renamed Ice::noExplicitCurrent to Ice::emptyCurrent
Diffstat (limited to 'cpp/src/IceGrid/NodeCache.cpp')
| -rw-r--r-- | cpp/src/IceGrid/NodeCache.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/IceGrid/NodeCache.cpp b/cpp/src/IceGrid/NodeCache.cpp index ce57c685ce5..6acb54222d7 100644 --- a/cpp/src/IceGrid/NodeCache.cpp +++ b/cpp/src/IceGrid/NodeCache.cpp @@ -402,7 +402,7 @@ NodeEntry::setSession(const NodeSessionIPtr& session) { try { - session->destroy(); + session->destroy(Ice::emptyCurrent); } catch(const Ice::ObjectNotExistException&) { @@ -569,7 +569,7 @@ NodeEntry::loadServer(const ServerEntryPtr& entry, const ServerInfo& server, con Lock sync(*this); checkSession(); node = _session->getNode(); - sessionTimeout = _session->getTimeout(); + sessionTimeout = _session->getTimeout(Ice::emptyCurrent); // // Check if we should use a specific timeout (the load |