Avoid self join

leecoder · leecoder · commit af17c777fac3 · 2014-06-16T18:33:12.000+09:00
diff --git a/boost/network/protocol/http/client/async_impl.hpp b/boost/network/protocol/http/client/async_impl.hpp
@@ -77,7 +77,9 @@ namespace boost { namespace network { namespace http {
       {
         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();
         }
         delete service_ptr;

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,9 @@ namespace boost { namespace network { namespace http {`
`77`	`77`	`{`
`78`	`78`	`sentinel_.reset();`
`79`	`79`	`if (lifetime_thread_.get()) {`
`80`		`- lifetime_thread_->join();`
	`80`	`+ if (lifetime_thread_->get_id() != boost::this_thread::get_id()) {`
	`81`	`+ lifetime_thread_->join();`
	`82`	`+ }`
`81`	`83`	`lifetime_thread_.reset();`
`82`	`84`	`}`
`83`	`85`	`delete service_ptr;`