diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2017-05-17 12:30:19 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2017-05-17 12:30:19 +0200 |
| commit | 634cf218753f412a51c42454dc3f7759581891ab (patch) | |
| tree | 488bbfd1ebaf23aa126df9a17da14690536956c7 /cpp/src | |
| parent | Fixed ICE-7882 - replaced IceBridge.Router with IceBridge.InstanceName (diff) | |
| download | ice-634cf218753f412a51c42454dc3f7759581891ab.tar.bz2 ice-634cf218753f412a51c42454dc3f7759581891ab.tar.xz ice-634cf218753f412a51c42454dc3f7759581891ab.zip | |
Fixed ICE-7880 - renamed HeartbeatOnInvocation to HeartbeatOnDispatch
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Glacier2/Glacier2Router.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/Ice/ACM.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/Ice/ConnectionI.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
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(); } |