TySS-Dev/nearby
1
0
Fork 0
mirror of https://github.com/kidfromjupiter/nearby.git synced 2026-09-16 15:36:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'google3' up to cl/356658736.

Browse Source
This commit is contained in:
hai007
2021-02-12 12:21:39 -08:00
parent 7069c57107 2d4edf5b18
commit 64ff9c1366
8 changed files with 25 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cpp/core/internal/service_controller_router.cc
+3 -4
View File
@@ -54,7 +54,7 @@ ServiceControllerRouter::~ServiceControllerRouter() {
.GetFlags()
.disable_released_service_controller) {
if (service_controller_) {
service_controller_->Shutdown();
service_controller_->Stop();
}
} else {
service_controller_.reset();
@@ -441,7 +441,7 @@ void ServiceControllerRouter::ReleaseServiceControllerForClient(
if (FeatureFlags::GetInstance()
.GetFlags()
.disable_released_service_controller) {
service_controller_->Shutdown();
service_controller_->Stop();
}
if (clients_.empty()) {
@@ -491,8 +491,7 @@ Status ServiceControllerRouter::UpdateCurrentServiceControllerAndStrategy(
return {Status::kError};
}
service_controller_ = absl::make_unique<StoppableServiceController>(
service_controller_factory_());
service_controller_.reset(service_controller_factory_());
current_strategy_ = strategy;
return {Status::kSuccess};