From 11678336dea1f3676881b87bbe8ca3e3cb6b5296 Mon Sep 17 00:00:00 2001
From: Bernard Normier <bernard@zeroc.com>
Date: Wed, 8 Mar 2017 19:37:13 -0500
Subject: Removed Current's default value in the C++11 mapping Renamed
 Ice::noExplicitCurrent to Ice::emptyCurrent

---
 cpp/src/IceGrid/NodeCache.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'cpp/src/IceGrid/NodeCache.cpp')

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
-- 
cgit v1.2.3