Commitce53598

committed

Merge pull request#402 from leecoder/0.11-devel

Fixes#358 - avoid self join

2 parents8c4a9da +9bd4e4f commitce53598Copy full SHA for ce53598

File tree

-1

lines changed

-1

lines changed

Lines changed: 3 additions & 1 deletion

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`	`}`

Comments

(0)