actix/actix-net
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-net synced 2025-06-27 00:27:43 +02:00
Code Issues Releases Wiki Activity

fix InOrderService::poll_ready() nested service rediness check

Browse Source
This commit is contained in:
Nikolay Kim
2019-03-12 16:03:05 -07:00
parent 5e6eed905c
commit 21c289d7e4
4 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
actix-utils/src/order.rs
View File

@ -140,9 +140,6 @@ where
// poll_ready could be called from different task
self.task.register();
// check nested service
self.service.poll_ready().map_err(InOrderError::Service)?;
// check acks
while !self.acks.is_empty() {
let rec = self.acks.front_mut().unwrap();
@ -156,7 +153,12 @@ where
}
}
Ok(Async::Ready(()))
// check nested service
if let Async::NotReady = self.service.poll_ready().map_err(InOrderError::Service)? {
Ok(Async::NotReady)
} else {
Ok(Async::Ready(()))
}
}
fn call(&mut self, request: S::Request) -> Self::Future {