[server] Revert shutdown protection.

project-chip · Jan 7, 2022 · 2f82dec · 2f82dec
1 parent 1c9fc33
commit 2f82dec
Showing 1 changed file with 1 addition and 7 deletions.
diff --git a/src/app/server/Server.cpp b/src/app/server/Server.cpp
@@ -233,8 +233,7 @@ CHIP_ERROR Server::Init(AppDelegate * delegate, uint16_t secureServicePort, uint
                                                     &mSessions, &mFabrics, &mSessionIDAllocator);
     SuccessOrExit(err);
 
-    err    = mCASESessionManager.Init();
-    mState = ServerState::Enabled;
+    err = mCASESessionManager.Init();
 
 exit:
     if (err != CHIP_NO_ERROR)
@@ -250,18 +249,13 @@ CHIP_ERROR Server::Init(AppDelegate * delegate, uint16_t secureServicePort, uint
 
 void Server::Shutdown()
 {
-    if (mState == ServerState::Disabled)
-        return;
-
     chip::Dnssd::ServiceAdvertiser::Instance().Shutdown();
     chip::app::InteractionModelEngine::GetInstance()->Shutdown();
     mExchangeMgr.Shutdown();
     mSessions.Shutdown();
     mTransports.Close();
     mCommissioningWindowManager.Shutdown();
     chip::Platform::MemoryShutdown();
-
-    mState = ServerState::Disabled;
 }
 
 #if CHIP_DEVICE_CONFIG_ENABLE_COMMISSIONER_DISCOVERY_CLIENT