Drop the read guard explicitly

Signed-off-by: kazk <kazk.dev@gmail.com>
kube-rs · Feb 20, 2022 · b2fc0ff · b2fc0ff
1 parent 4f441f4
commit b2fc0ff
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/kube-client/src/client/auth/mod.rs b/kube-client/src/client/auth/mod.rs
@@ -206,15 +206,13 @@ impl RefreshableToken {
             }
 
             RefreshableToken::File(token_file) => {
-                if let Some(header) = {
-                    // Drop `RwLockReadGuard` before a write lock attempt to prevent deadlock.
-                    let guard = token_file.read().await;
-                    guard.cached_token().map(bearer_header)
-                } {
-                    header
-                } else {
-                    bearer_header(token_file.write().await.token())
+                let guard = token_file.read().await;
+                if let Some(header) = guard.cached_token().map(bearer_header) {
+                    return header;
                 }
+                // Drop the read guard before a write lock attempt to prevent deadlock.
+                drop(guard);
+                bearer_header(token_file.write().await.token())
             }
 
             #[cfg(feature = "oauth")]