From 3aad6e7d6c87461c81543deb8b808e615f3800a2 Mon Sep 17 00:00:00 2001
From: Jeff Mitchell <jeffrey.mitchell@gmail.com>
Date: Mon, 3 Dec 2018 14:30:09 -0500
Subject: [PATCH] Update request_handling.go

---
 vault/request_handling.go | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/vault/request_handling.go b/vault/request_handling.go
index 23dbde2ad8ee1..7b40a1d9b492d 100644
--- a/vault/request_handling.go
+++ b/vault/request_handling.go
@@ -373,10 +373,7 @@ func (c *Core) HandleRequest(httpCtx context.Context, req *logical.Request) (res
 
 	resp, err = c.handleCancelableRequest(ctx, ns, req)
 
-	if req != nil {
-		req.SetTokenEntry(nil)
-	}
-
+	req.SetTokenEntry(nil)
 	cancel()
 	c.stateLock.RUnlock()
 	return resp, err