grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed panic on session creation

Browse Source
This commit is contained in:
arkpar 2016-02-14 11:54:08 +01:00
parent 718646f943
commit 7503d6695a
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
util/src/network/host.rs
View File

@ -635,7 +635,13 @@ impl<Message> Host<Message> where Message: Send + Sync + Clone {
// turn a handshake into a session // turn a handshake into a session
let mut sessions = self.sessions.write().unwrap(); let mut sessions = self.sessions.write().unwrap();
let h = handshakes.remove(token).unwrap(); let mut h = handshakes.remove(token).unwrap();
// wait for other threads to stop using it
{
while Arc::get_mut(&mut h).is_none() {
h.lock().ok();
}
}
let h = Arc::try_unwrap(h).ok().unwrap().into_inner().unwrap(); let h = Arc::try_unwrap(h).ok().unwrap().into_inner().unwrap();
let result = sessions.insert_with(move |session_token| { let result = sessions.insert_with(move |session_token| {
let session = Session::new(h, session_token, &self.info.read().unwrap()).expect("Session creation error"); let session = Session::new(h, session_token, &self.info.read().unwrap()).expect("Session creation error");