Fix HTTPControlPlane thread may not be joined

happyharryh · happyharryh · commit bf50475a9612 · 2026-01-21T10:22:51.000+08:00
diff --git a/service/OneService.cpp b/service/OneService.cpp
@@ -1014,12 +1014,12 @@ class OneServiceImpl : public OneService {
 		curl_global_cleanup();
 #endif
 
-		_controlPlane.stop();
 		if (_serverThreadRunning) {
+			_controlPlane.stop();
 			_serverThread.join();
 		}
-		_controlPlaneV6.stop();
 		if (_serverThreadRunningV6) {
+			_controlPlaneV6.stop();
 			_serverThreadV6.join();
 		}
 		_rxPacketVector_m.lock();

Original file line number	Diff line number	Diff line change
`@@ -1014,12 +1014,12 @@ class OneServiceImpl : public OneService {`
`1014`	`1014`	`curl_global_cleanup();`
`1015`	`1015`	`#endif`
`1016`	`1016`
`1017`		`- _controlPlane.stop();`
`1018`	`1017`	`if (_serverThreadRunning) {`
	`1018`	`+ _controlPlane.stop();`
`1019`	`1019`	`_serverThread.join();`
`1020`	`1020`	`}`
`1021`		`- _controlPlaneV6.stop();`
`1022`	`1021`	`if (_serverThreadRunningV6) {`
	`1022`	`+ _controlPlaneV6.stop();`
`1023`	`1023`	`_serverThreadV6.join();`
`1024`	`1024`	`}`
`1025`	`1025`	`_rxPacketVector_m.lock();`