Shut down remote components in the correct order (caught by a unit te…

…st: excellent!).
pantsbuild · Aug 28, 2018 · c3c8afa · c3c8afa
1 parent ecee24a
commit c3c8afa
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/src/rust/engine/fs/src/store.rs b/src/rust/engine/fs/src/store.rs
@@ -1637,12 +1637,10 @@ mod remote {
     where
       F: FnOnce() -> (),
     {
-      self.channel.with_reset(|| {
-        self.env.with_reset(|| {
-          self
-            .cas_client
-            .with_reset(|| self.byte_stream_client.with_reset(f))
-        })
+      self.cas_client.with_reset(|| {
+        self
+          .byte_stream_client
+          .with_reset(|| self.channel.with_reset(|| self.env.with_reset(f)))
       })
     }