Cloud app disconnect tests + fix

1 files changed, 6 insertions, 4 deletions

diff --git a/src/components/application_manager/src/application_manager_impl.cc b/src/components/application_manager/src/application_manager_impl.cc
index 9d16c366d5..1eeaa8f739 100644
--- a/src/components/application_manager/src/application_manager_impl.cc
+++ b/src/components/application_manager/src/application_manager_impl.cc
@@ -1195,14 +1195,15 @@ void ApplicationManagerImpl::SetPendingApplicationState(
   }
   LOG4CXX_DEBUG(logger_,
                 "Unregister application and move into apps_to_register");
-  {
-    sync_primitives::AutoLock lock(apps_to_register_list_lock_ptr_);
-    apps_to_register_.insert(app);
-  }
 
   UnregisterApplication(
       app->app_id(), mobile_apis::Result::INVALID_ENUM, true, true);
   app->MarkUnregistered();
+
+  {
+    sync_primitives::AutoLock lock(apps_to_register_list_lock_ptr_);
+    apps_to_register_.insert(app);
+  }
 }
 
 void ApplicationManagerImpl::OnConnectionStatusUpdated() {
@@ -2923,6 +2924,7 @@ void ApplicationManagerImpl::UnregisterApplication(
     auto it_app = applications_.begin();
     while (applications_.end() != it_app) {
       if (app_id == (*it_app)->app_id()) {
+        connection_handler().GetDeviceID((*it_app)->mac_address(), &handle);
         app_to_remove = *it_app;
         applications_.erase(it_app++);
       } else {