Fix HTTPControlPlane thread may not be joined

happyharryh · happyharryh · commit 8014421b3b4d · 2025-12-25T10:31:37.000+08:00
diff --git a/service/OneService.cpp b/service/OneService.cpp
@@ -1016,11 +1016,11 @@ class OneServiceImpl : public OneService {
 #endif
 
 		_controlPlane.stop();
-		if (_serverThreadRunning) {
+		if (_serverThread.joinable()) {
 			_serverThread.join();
 		}
 		_controlPlaneV6.stop();
-		if (_serverThreadRunningV6) {
+		if (_serverThreadV6.joinable()) {
 			_serverThreadV6.join();
 		}
 		_rxPacketVector_m.lock();

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