diff options
| author | JackLivio <jack@livio.io> | 2018-08-29 14:08:41 -0400 |
|---|---|---|
| committer | JackLivio <jack@livio.io> | 2018-08-29 14:08:41 -0400 |
| commit | cee3ba5cec980dcee4cc37af71bd09dc306d3867 (patch) | |
| tree | 3f22a7132d77dde142019231bf10ab2e3be1f5dd /src/components/policy/policy_regular/src/cache_manager.cc | |
| parent | 90db9ca480eabeaf85ec77626b1bf10fa491270d (diff) | |
| parent | 09e4e684708ad5ab2544c72745516e9fe481ba0b (diff) | |
| download | sdl_core-cee3ba5cec980dcee4cc37af71bd09dc306d3867.tar.gz | |
Merge remote-tracking branch 'origin/develop' into feature/boost_filesystem_implementation
# Conflicts:
# src/3rd_party/CMakeLists.txt
# src/components/utils/CMakeLists.txt
Diffstat (limited to 'src/components/policy/policy_regular/src/cache_manager.cc')
| -rw-r--r-- | src/components/policy/policy_regular/src/cache_manager.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/components/policy/policy_regular/src/cache_manager.cc b/src/components/policy/policy_regular/src/cache_manager.cc index 2ae0f79f75..9accabf59b 100644 --- a/src/components/policy/policy_regular/src/cache_manager.cc +++ b/src/components/policy/policy_regular/src/cache_manager.cc @@ -645,7 +645,7 @@ int CacheManager::TimeoutResponse() { CACHE_MANAGER_CHECK(0); sync_primitives::AutoLock auto_lock(cache_lock_); return pt_->policy_table.module_config.timeout_after_x_seconds * - date_time::DateTime::MILLISECONDS_IN_SECOND; + date_time::MILLISECONDS_IN_SECOND; } bool CacheManager::SecondsBetweenRetries(std::vector<int>& seconds) { @@ -825,6 +825,9 @@ void CacheManager::CheckSnapshotInitialization() { *(snapshot_->policy_table.module_config.preloaded_pt) = false; + *(snapshot_->policy_table.module_config.full_app_id_supported) = + settings_->use_full_app_id(); + // SDL must not send certificate in snapshot snapshot_->policy_table.module_config.certificate = rpc::Optional<rpc::String<0, 65535> >(); |