4 files changed, 15 insertions, 0 deletions
diff --git a/cpp/src/Glacier2/RouterI.cpp b/cpp/src/Glacier2/RouterI.cpp
index a075b20ac75..490395e4e5e 100644
--- a/cpp/src/Glacier2/RouterI.cpp
+++ b/cpp/src/Glacier2/RouterI.cpp
@@ -171,6 +171,13 @@ Glacier2::RouterI::destroySession(const Current&)
     assert(false); // Must not be called in this router implementation.
 }
 
+Ice::Int
+Glacier2::RouterI::getSessionTimeout(const Current&) const
+{
+    assert(false); // Must not be called in this router implementation.
+    return 0;
+}
+
 ClientBlobjectPtr
 Glacier2::RouterI::getClientBlobject() const
 {
diff --git a/cpp/src/Glacier2/RouterI.h b/cpp/src/Glacier2/RouterI.h
index 80b5f160cc0..0f4c964742c 100644
--- a/cpp/src/Glacier2/RouterI.h
+++ b/cpp/src/Glacier2/RouterI.h
@@ -38,6 +38,7 @@ public:
     virtual std::string getCategoryForClient(const Ice::Current&) const;
     virtual SessionPrx createSession(const std::string&, const std::string&, const Ice::Current&);
     virtual void destroySession(const ::Ice::Current&);
+    virtual Ice::Int getSessionTimeout(const ::Ice::Current&) const;
 
     ClientBlobjectPtr getClientBlobject() const;
     ServerBlobjectPtr getServerBlobject() const;
diff --git a/cpp/src/Glacier2/SessionRouterI.cpp b/cpp/src/Glacier2/SessionRouterI.cpp
index 8d34a4139c0..33c03bd7b61 100644
--- a/cpp/src/Glacier2/SessionRouterI.cpp
+++ b/cpp/src/Glacier2/SessionRouterI.cpp
@@ -599,6 +599,12 @@ Glacier2::SessionRouterI::destroySession(const ConnectionPtr& connection)
     }
 }
 
+Ice::Int
+Glacier2::SessionRouterI::getSessionTimeout(const Ice::Current&) const
+{
+    return _sessionTimeout.toSeconds();
+}
+
 RouterIPtr
 Glacier2::SessionRouterI::getRouter(const ConnectionPtr& connection, const Ice::Identity& id) const
 {
diff --git a/cpp/src/Glacier2/SessionRouterI.h b/cpp/src/Glacier2/SessionRouterI.h
index 03e5115b581..29ba0d4db4e 100644
--- a/cpp/src/Glacier2/SessionRouterI.h
+++ b/cpp/src/Glacier2/SessionRouterI.h
@@ -43,6 +43,7 @@ public:
     virtual std::string getCategoryForClient(const Ice::Current&) const;
     virtual SessionPrx createSession(const std::string&, const std::string&, const Ice::Current&);
     virtual void destroySession(const ::Ice::Current&);
+    virtual Ice::Int getSessionTimeout(const ::Ice::Current&) const;
 
     RouterIPtr getRouter(const Ice::ConnectionPtr&, const Ice::Identity&) const;    
     RouterIPtr getRouter(const std::string&) const;