diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2017-04-03 11:58:25 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2017-04-03 11:58:25 +0200 |
| commit | 1b08fada02668508d6af77941487bbc1dd31a787 (patch) | |
| tree | 0ad800808137e1d763323ede75b2e6b504a6f343 /cpp/src/Ice/ACM.cpp | |
| parent | Better fix for VC90 handleException overloads (diff) | |
| download | ice-1b08fada02668508d6af77941487bbc1dd31a787.tar.bz2 ice-1b08fada02668508d6af77941487bbc1dd31a787.tar.xz ice-1b08fada02668508d6af77941487bbc1dd31a787.zip | |
Fixed leak in IceSSL secure transport implementatoin & minor code style fixes
Diffstat (limited to 'cpp/src/Ice/ACM.cpp')
| -rw-r--r-- | cpp/src/Ice/ACM.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cpp/src/Ice/ACM.cpp b/cpp/src/Ice/ACM.cpp index 87ae7920096..2afcf21b3c2 100644 --- a/cpp/src/Ice/ACM.cpp +++ b/cpp/src/Ice/ACM.cpp @@ -48,7 +48,8 @@ IceInternal::ACMConfig::ACMConfig(const Ice::PropertiesPtr& p, this->timeout = IceUtil::Time::seconds(p->getPropertyAsIntWithDefault(timeoutProperty, static_cast<int>(dflt.timeout.toSeconds()))); int hb = p->getPropertyAsIntWithDefault(prefix + ".Heartbeat", static_cast<int>(dflt.heartbeat)); - if(hb >= static_cast<int>(ICE_ENUM(ACMHeartbeat, HeartbeatOff)) && hb <= static_cast<int>(ICE_ENUM(ACMHeartbeat, HeartbeatAlways))) + if(hb >= static_cast<int>(ICE_ENUM(ACMHeartbeat, HeartbeatOff)) && + hb <= static_cast<int>(ICE_ENUM(ACMHeartbeat, HeartbeatAlways))) { this->heartbeat = static_cast<Ice::ACMHeartbeat>(hb); } @@ -59,7 +60,8 @@ IceInternal::ACMConfig::ACMConfig(const Ice::PropertiesPtr& p, } int cl = p->getPropertyAsIntWithDefault(prefix + ".Close", static_cast<int>(dflt.close)); - if(cl >= static_cast<int>(ICE_ENUM(ACMClose, CloseOff)) && cl <= static_cast<int>(ICE_ENUM(ACMClose, CloseOnIdleForceful))) + if(cl >= static_cast<int>(ICE_ENUM(ACMClose, CloseOff)) && + cl <= static_cast<int>(ICE_ENUM(ACMClose, CloseOnIdleForceful))) { this->close = static_cast<Ice::ACMClose>(cl); } |