Merge pull request cpp-netlib#402 from leecoder/0.11-devel

deanberris · deanberris · commit ce53598c53ed · 2014-06-18T19:31:49.000+10:00
Fixes cpp-netlib#358 - avoid self join
diff --git a/boost/network/protocol/http/client/async_impl.hpp b/boost/network/protocol/http/client/async_impl.hpp
@@ -64,7 +64,9 @@ struct async_client
   ~async_client() throw() {
     sentinel_.reset();
     if (lifetime_thread_.get()) {
-      lifetime_thread_->join();
+      if (lifetime_thread_->get_id() != boost::this_thread::get_id()) {
+        lifetime_thread_->join();
+      }
       lifetime_thread_.reset();
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,9 @@ struct async_client`
`64`	`64`	`~async_client() throw() {`
`65`	`65`	`sentinel_.reset();`
`66`	`66`	`if (lifetime_thread_.get()) {`
`67`		`- lifetime_thread_->join();`
	`67`	`+ if (lifetime_thread_->get_id() != boost::this_thread::get_id()) {`
	`68`	`+ lifetime_thread_->join();`
	`69`	`+ }`
`68`	`70`	`lifetime_thread_.reset();`
`69`	`71`	`}`
`70`	`72`	`}`