diff options
| author | Andrii Kalinich <AKalinich@luxoft.com> | 2019-09-30 18:12:54 -0400 |
|---|---|---|
| committer | Andrii Kalinich <AKalinich@luxoft.com> | 2019-09-30 18:12:54 -0400 |
| commit | f70d036ce4f3e618182ee2e2cf1b0badd38816c8 (patch) | |
| tree | de58f3a06a13aaecf6b52969eb56c72050409200 | |
| parent | ff19860ee7b528a3e7d3cf307fa1fb465b15bc89 (diff) | |
| download | sdl_core-fix/fix_ptu_notifications_order.tar.gz | |
fixup! Fix order of actions taken during PTUfix/fix_ptu_notifications_order
| -rw-r--r-- | src/components/policy/policy_external/src/policy_manager_impl.cc | 7 | ||||
| -rw-r--r-- | src/components/policy/policy_regular/src/policy_manager_impl.cc | 7 |
2 files changed, 6 insertions, 8 deletions
diff --git a/src/components/policy/policy_external/src/policy_manager_impl.cc b/src/components/policy/policy_external/src/policy_manager_impl.cc index 83a272b2fe..2d8df07271 100644 --- a/src/components/policy/policy_external/src/policy_manager_impl.cc +++ b/src/components/policy/policy_external/src/policy_manager_impl.cc @@ -1904,10 +1904,9 @@ std::string PolicyManagerImpl::ForcePTExchange() { void policy::PolicyManagerImpl::StopRetrySequence() { LOG4CXX_AUTO_TRACE(logger_); - const ResetRetryCountType reset_type = - cache_->UpdateRequired() ? ResetRetryCountType::kResetWithStatusUpdate - : ResetRetryCountType::kResetInternally; - ResetRetrySequence(reset_type); + if (cache_->UpdateRequired()) { + ResetRetrySequence(ResetRetryCountType::kResetWithStatusUpdate); + } } std::string PolicyManagerImpl::ForcePTExchangeAtUserRequest() { diff --git a/src/components/policy/policy_regular/src/policy_manager_impl.cc b/src/components/policy/policy_regular/src/policy_manager_impl.cc index 943535b3c5..4c3f0763bc 100644 --- a/src/components/policy/policy_regular/src/policy_manager_impl.cc +++ b/src/components/policy/policy_regular/src/policy_manager_impl.cc @@ -1261,10 +1261,9 @@ void PolicyManagerImpl::StopRetrySequence() { timer_retry_sequence_.Stop(); } - const ResetRetryCountType reset_type = - cache_->UpdateRequired() ? ResetRetryCountType::kResetWithStatusUpdate - : ResetRetryCountType::kResetInternally; - ResetRetrySequence(reset_type); + if (cache_->UpdateRequired()) { + ResetRetrySequence(ResetRetryCountType::kResetWithStatusUpdate); + } } std::string PolicyManagerImpl::ForcePTExchangeAtUserRequest() { |