ing

servlet.go

@@ -85,14 +85,13 @@ func (s *rpcServlet) Stop() {
 		panic("Server: server must be started before stopping it")
 	}
 
-	s.sh.Destroy(s.ctx)
-
 	close(s.stopChan)
 	s.stopWg.Wait()
+
+	s.sh.Destroy(s.ctx)
+
 	s.stopChan = nil
-
 	s.responseQueueChan = nil
-
 	s.conn = nil
 	s.serverCodec = nil
 
@@ -123,9 +122,9 @@ func handleServlet(s *rpcServlet) {
 	logging.Logger().Info(fmt.Sprintf("Servlet is started"))
 
 	defer func() {
-		s.doneChan <- err
 		s.stopWg.Done()
 		s.Stop()
+		s.doneChan <- err
 	}()
 
 	subStopChan := make(chan struct{})