Merge branch 'acm1' into acm2

zeroc-ice · Apr 11, 2024 · 7a0d136 · 7a0d136
2 parents 9c7f15e + ebb1312
commit 7a0d136
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/cpp/src/Ice/ConnectionI.cpp b/cpp/src/Ice/ConnectionI.cpp
@@ -2590,7 +2590,7 @@ void
 Ice::ConnectionI::sendHeartbeat() noexcept
 {
     lock_guard lock(_mutex);
-    if (_state == StateActive)
+    if (_state == StateActive || _state == StateHolding)
     {
         sendHeartbeatNow();
     }
@@ -2600,7 +2600,7 @@ Ice::ConnectionI::sendHeartbeat() noexcept
 void
 Ice::ConnectionI::sendHeartbeatNow()
 {
-    assert(_state == StateActive);
+    assert(_state == StateActive || _state == StateHolding);
 
     if (!_endpoint->datagram())
     {

diff --git a/cpp/test/Ice/hold/Client.cpp b/cpp/test/Ice/hold/Client.cpp
@@ -21,6 +21,7 @@ Client::run(int argc, char** argv)
     Ice::InitializationData initData;
     initData.properties = createTestProperties(argc, argv);
     initData.properties->setProperty("Ice.IdleTimeout", "1");
+    initData.properties->setProperty("Ice.EnableIdleCheck", "1");
     Ice::CommunicatorHolder communicator = initialize(argc, argv, initData);
     void allTests(Test::TestHelper*);
     allTests(this);