char
/
matrix-rust-sdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

async_client: Don't request a write lock for crypto based requests. 

The crypto state machine is in the base client behind a separate lock so
there's no need to require write access.

This removes a deadlock if we're trying to send an encrypted message
from a event emitter callback, since emitting an event fetches a read
lock as well.
master
Damir Jelić 2020-04-23 14:56:59 +02:00
parent 986985464a
commit 6d12ed2046
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/async_client.rs
View File

@ -962,7 +962,7 @@ impl AsyncClient {
let response = self.send(request).await?; let response = self.send(request).await?;
self.base_client self.base_client
.write() .read()
.await .await
.receive_keys_claim_response(&response) .receive_keys_claim_response(&response)
.await?; .await?;
@ -1032,7 +1032,7 @@ impl AsyncClient {
let response = self.send(request).await?; let response = self.send(request).await?;
self.base_client self.base_client
.write() .read()
.await .await
.receive_keys_upload_response(&response) .receive_keys_upload_response(&response)
.await?; .await?;
@ -1081,7 +1081,7 @@ impl AsyncClient {
let response = self.send(request).await?; let response = self.send(request).await?;
self.base_client self.base_client
.write() .read()
.await .await
.receive_keys_query_response(&response) .receive_keys_query_response(&response)
.await?; .await?;