Fixed ICE-7880 - renamed HeartbeatOnInvocation to HeartbeatOnDispatch

13 files changed, 16 insertions, 12 deletions

diff --git a/CHANGELOG-3.7.md b/CHANGELOG-3.7.md
index 15db623cc08..9f7ac626c53 100644
--- a/CHANGELOG-3.7.md
+++ b/CHANGELOG-3.7.md
@@ -25,6 +25,10 @@ These are the changes since the Ice 3.6 release or snapshot described in
 
 ## General Changes
 
+- Renamed ACM heartbeat enumeration value `HeartbeatOnInvocation` to
+  `HeartbeatOnDispatch`. The heartbeats are sent only when dispatch are in 
+  progress and the connection is idle.
+
 - Semicolons are now optional after braces in Slice definitions. For example
   ```
   module M
diff --git a/cpp/src/Glacier2/Glacier2Router.cpp b/cpp/src/Glacier2/Glacier2Router.cpp
index ee0d93a91ce..2f23bd6d21b 100644
--- a/cpp/src/Glacier2/Glacier2Router.cpp
+++ b/cpp/src/Glacier2/Glacier2Router.cpp
@@ -363,7 +363,7 @@ RouterService::start(int argc, char* argv[], int& status)
     // Glacier2 router Ice object.
     //
     Identity routerId;
-    routerId.category = _instance->properties()->getPropertyWithDefault("Glacier2.InstanceName", "Glacier2");
+    routerId.category = instanceName;
     routerId.name = "router";
     Glacier2::RouterPrx routerPrx = Glacier2::RouterPrx::uncheckedCast(clientAdapter->add(_sessionRouter, routerId));
 
diff --git a/cpp/src/Ice/ACM.cpp b/cpp/src/Ice/ACM.cpp
index 2afcf21b3c2..6cdec20d8f7 100644
--- a/cpp/src/Ice/ACM.cpp
+++ b/cpp/src/Ice/ACM.cpp
@@ -25,7 +25,7 @@ IceUtil::Shared* IceInternal::upCast(FactoryACMMonitor* p) { return p; }
 
 IceInternal::ACMConfig::ACMConfig(bool server) :
     timeout(IceUtil::Time::seconds(60)),
-    heartbeat(ICE_ENUM(ACMHeartbeat, HeartbeatOnInvocation)),
+    heartbeat(ICE_ENUM(ACMHeartbeat, HeartbeatOnDispatch)),
     close(server ? ICE_ENUM(ACMClose, CloseOnInvocation) : ICE_ENUM(ACMClose, CloseOnInvocationAndIdle))
 {
 }
diff --git a/cpp/src/Ice/ConnectionI.cpp b/cpp/src/Ice/ConnectionI.cpp
index 55e3c48d18e..46b276647c0 100644
--- a/cpp/src/Ice/ConnectionI.cpp
+++ b/cpp/src/Ice/ConnectionI.cpp
@@ -650,7 +650,7 @@ Ice::ConnectionI::monitor(const IceUtil::Time& now, const ACMConfig& acm)
        (acm.heartbeat != ICE_ENUM(ACMHeartbeat, HeartbeatOff) &&
         _writeStream.b.empty() && now >= (_acmLastActivity + acm.timeout / 4)))
     {
-        if(acm.heartbeat != ICE_ENUM(ACMHeartbeat, HeartbeatOnInvocation) || _dispatchCount > 0)
+        if(acm.heartbeat != ICE_ENUM(ACMHeartbeat, HeartbeatOnDispatch) || _dispatchCount > 0)
         {
             sendHeartbeatNow();
         }
diff --git a/csharp/src/Ice/ACM.cs b/csharp/src/Ice/ACM.cs
index e0d03af69c0..cacccfb41c8 100644
--- a/csharp/src/Ice/ACM.cs
+++ b/csharp/src/Ice/ACM.cs
@@ -17,7 +17,7 @@ namespace IceInternal
         internal ACMConfig(bool server)
         {
             timeout = 60 * 1000;
-            heartbeat = Ice.ACMHeartbeat.HeartbeatOnInvocation;
+            heartbeat = Ice.ACMHeartbeat.HeartbeatOnDispatch;
             close = server ? Ice.ACMClose.CloseOnInvocation : Ice.ACMClose.CloseOnInvocationAndIdle;
         }
 
diff --git a/csharp/src/Ice/ConnectionI.cs b/csharp/src/Ice/ConnectionI.cs
index 362d7856d42..d3150ba8321 100644
--- a/csharp/src/Ice/ConnectionI.cs
+++ b/csharp/src/Ice/ConnectionI.cs
@@ -345,7 +345,7 @@ namespace Ice
                    (acm.heartbeat != ACMHeartbeat.HeartbeatOff && _writeStream.isEmpty() &&
                     now >= (_acmLastActivity + acm.timeout / 4)))
                 {
-                    if(acm.heartbeat != ACMHeartbeat.HeartbeatOnInvocation || _dispatchCount > 0)
+                    if(acm.heartbeat != ACMHeartbeat.HeartbeatOnDispatch || _dispatchCount > 0)
                     {
                         sendHeartbeatNow();
                     }
diff --git a/java-compat/src/Ice/src/main/java/Ice/ConnectionI.java b/java-compat/src/Ice/src/main/java/Ice/ConnectionI.java
index 154e1219cac..510f7f8f680 100644
--- a/java-compat/src/Ice/src/main/java/Ice/ConnectionI.java
+++ b/java-compat/src/Ice/src/main/java/Ice/ConnectionI.java
@@ -315,7 +315,7 @@ public final class ConnectionI extends IceInternal.EventHandler
            (acm.heartbeat != ACMHeartbeat.HeartbeatOff && _writeStream.isEmpty() &&
             now >= (_acmLastActivity + acm.timeout / 4)))
         {
-            if(acm.heartbeat != ACMHeartbeat.HeartbeatOnInvocation || _dispatchCount > 0)
+            if(acm.heartbeat != ACMHeartbeat.HeartbeatOnDispatch || _dispatchCount > 0)
             {
                 sendHeartbeatNow();
             }
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/ACMConfig.java b/java-compat/src/Ice/src/main/java/IceInternal/ACMConfig.java
index 0d392fc719b..779e386f6b8 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/ACMConfig.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/ACMConfig.java
@@ -14,7 +14,7 @@ public final class ACMConfig implements java.lang.Cloneable
     ACMConfig(boolean server)
     {
         timeout = 60 * 1000;
-        heartbeat = Ice.ACMHeartbeat.HeartbeatOnInvocation;
+        heartbeat = Ice.ACMHeartbeat.HeartbeatOnDispatch;
         close = server ? Ice.ACMClose.CloseOnInvocation : Ice.ACMClose.CloseOnInvocationAndIdle;
     }
 
diff --git a/java/src/Ice/src/main/java/com/zeroc/Ice/ConnectionI.java b/java/src/Ice/src/main/java/com/zeroc/Ice/ConnectionI.java
index bd28f6148fd..0aedf4dff08 100644
--- a/java/src/Ice/src/main/java/com/zeroc/Ice/ConnectionI.java
+++ b/java/src/Ice/src/main/java/com/zeroc/Ice/ConnectionI.java
@@ -325,7 +325,7 @@ public final class ConnectionI extends com.zeroc.IceInternal.EventHandler
            (acm.heartbeat != ACMHeartbeat.HeartbeatOff && _writeStream.isEmpty() &&
             now >= (_acmLastActivity + acm.timeout / 4)))
         {
-            if(acm.heartbeat != ACMHeartbeat.HeartbeatOnInvocation || _dispatchCount > 0)
+            if(acm.heartbeat != ACMHeartbeat.HeartbeatOnDispatch || _dispatchCount > 0)
             {
                 sendHeartbeatNow();
             }
diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/ACMConfig.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/ACMConfig.java
index 4dcc3e993d7..34ce0969c43 100644
--- a/java/src/Ice/src/main/java/com/zeroc/IceInternal/ACMConfig.java
+++ b/java/src/Ice/src/main/java/com/zeroc/IceInternal/ACMConfig.java
@@ -17,7 +17,7 @@ public final class ACMConfig implements java.lang.Cloneable
     ACMConfig(boolean server)
     {
         timeout = 60 * 1000;
-        heartbeat = ACMHeartbeat.HeartbeatOnInvocation;
+        heartbeat = ACMHeartbeat.HeartbeatOnDispatch;
         close = server ? ACMClose.CloseOnInvocation : ACMClose.CloseOnInvocationAndIdle;
     }
 
diff --git a/js/src/Ice/ACM.js b/js/src/Ice/ACM.js
index cab527d121b..64f5e86df3f 100644
--- a/js/src/Ice/ACM.js
+++ b/js/src/Ice/ACM.js
@@ -19,7 +19,7 @@ class ACMConfig
         if(p === undefined)
         {
             this.timeout = 60 * 1000;
-            this.heartbeat = Ice.ACMHeartbeat.HeartbeatOnInvocation;
+            this.heartbeat = Ice.ACMHeartbeat.HeartbeatOnDispatch;
             this.close = Ice.ACMClose.CloseOnInvocationAndIdle;
             return;
         }
diff --git a/js/src/Ice/ConnectionI.js b/js/src/Ice/ConnectionI.js
index 0ab59707509..5c631d2e045 100644
--- a/js/src/Ice/ConnectionI.js
+++ b/js/src/Ice/ConnectionI.js
@@ -327,7 +327,7 @@ class ConnectionI
            (acm.heartbeat != Ice.ACMHeartbeat.HeartbeatOff && this._writeStream.isEmpty() &&
            now >= (this._acmLastActivity + acm.timeout / 4)))
         {
-            if(acm.heartbeat != Ice.ACMHeartbeat.HeartbeatOnInvocation || this._dispatchCount > 0)
+            if(acm.heartbeat != Ice.ACMHeartbeat.HeartbeatOnDispatch || this._dispatchCount > 0)
             {
                 this.sendHeartbeatNow(); // Send heartbeat if idle in the last timeout / 2 period.
             }
diff --git a/slice/Ice/Connection.ice b/slice/Ice/Connection.ice
index 75ea49989f8..3fdcc82f834 100644
--- a/slice/Ice/Connection.ice
+++ b/slice/Ice/Connection.ice
@@ -142,7 +142,7 @@ local enum ACMClose
 local enum ACMHeartbeat
 {
     HeartbeatOff,
-    HeartbeatOnInvocation,
+    HeartbeatOnDispatch,
     HeartbeatOnIdle,
     HeartbeatAlways
 }