From 001b1b1e43b7d8d0fd4540a1c39d97d3cdaeb9af Mon Sep 17 00:00:00 2001
From: Tim Kuehn <timothy.j.kuehn@gmail.com>
Date: Fri, 15 Jan 2016 00:34:36 -0800
Subject: [PATCH] Only join reader thread if tcp stream shutdown succeeded.

---
 tarpc/src/protocol.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tarpc/src/protocol.rs b/tarpc/src/protocol.rs
index f0d22a1..1414570 100644
--- a/tarpc/src/protocol.rs
+++ b/tarpc/src/protocol.rs
@@ -457,8 +457,9 @@ impl<Request, Reply> Drop for Client<Request, Reply>
                             .stream
                             .shutdown(::std::net::Shutdown::Both) {
             warn!("Client: couldn't shutdown reader thread: {:?}", e);
+        } else {
+            self.reader_guard.take().unwrap().join().unwrap();
         }
-        self.reader_guard.take().unwrap().join().unwrap();
     }
 }