fix InOrderService::poll_ready() nested service rediness check

actix-server/Cargo.toml

@@ -33,7 +33,7 @@ ssl = ["openssl", "tokio-openssl"]
 rust-tls = ["rustls", "tokio-rustls", "webpki", "webpki-roots"]
 
 [dependencies]
-actix-rt = "0.2.0"
+actix-rt = "0.2.1"
 actix-service = "0.3.3"
 actix-server-config = { path="../actix-server-config" }
 

actix-utils/CHANGES.md

@@ -10,6 +10,8 @@
 
 * Fix `InFlightService::poll_ready()` nested service readiness check
 
+* Fix `InOrderService::poll_ready()` nested service readiness check
+
 
 ## [0.3.3] - 2019-03-09
 

actix-utils/Cargo.toml

@@ -27,4 +27,4 @@ tokio-current-thread = "0.1.4"
 log = "0.4"
 
 [dev-dependencies]
-actix-rt = "0.2"
+actix-rt = "0.2.1"

actix-utils/src/order.rs

@@ -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 {