Fix IceGrid Glacier2 session managers to keep sessions alive (#2756)

zeroc-ice · Sep 30, 2024 · c2e07e9 · c2e07e9
1 parent 5efb9f4
commit c2e07e9
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 0 deletions.
diff --git a/cpp/src/IceGrid/AdminSessionI.cpp b/cpp/src/IceGrid/AdminSessionI.cpp
@@ -116,6 +116,12 @@ AdminSessionI::~AdminSessionI()
 {
 }
 
+void
+AdminSessionI::ice_ping(const Ice::Current& current) const
+{
+    const_cast<AdminSessionI*>(this)->keepAlive(current);
+}
+
 Ice::ObjectPrx
 AdminSessionI::_register(const SessionServantManagerPtr& servantManager, const Ice::ConnectionPtr& con)
 {

diff --git a/cpp/src/IceGrid/AdminSessionI.h b/cpp/src/IceGrid/AdminSessionI.h
@@ -28,6 +28,8 @@ class AdminSessionI : public BaseSessionI, public AdminSession
 
     Ice::ObjectPrx _register(const SessionServantManagerPtr&, const Ice::ConnectionPtr&);
 
+    virtual void ice_ping(const Ice::Current&) const;
+
     virtual void keepAlive(const Ice::Current& current) { BaseSessionI::keepAlive(current); }
 
     virtual AdminPrx getAdmin(const Ice::Current&) const;

diff --git a/cpp/src/IceGrid/SessionI.cpp b/cpp/src/IceGrid/SessionI.cpp
@@ -155,6 +155,12 @@ SessionI::~SessionI()
 {
 }
 
+void
+SessionI::ice_ping(const Ice::Current& current) const
+{
+    const_cast<SessionI*>(this)->keepAlive(current);
+}
+
 Ice::ObjectPrx
 SessionI::_register(const SessionServantManagerPtr& servantManager, const Ice::ConnectionPtr& con)
 {

diff --git a/cpp/src/IceGrid/SessionI.h b/cpp/src/IceGrid/SessionI.h
@@ -73,6 +73,8 @@ class SessionI : public BaseSessionI, public Session
 
     Ice::ObjectPrx _register(const SessionServantManagerPtr&, const Ice::ConnectionPtr&);
 
+    virtual void ice_ping(const Ice::Current&) const;
+
     virtual void keepAlive(const Ice::Current& current) { BaseSessionI::keepAlive(current); }
 
     virtual void allocateObjectById_async(const AMD_Session_allocateObjectByIdPtr&, const Ice::Identity&,