From f614a8230c84a505597de0bd6380e5e2fea117ea Mon Sep 17 00:00:00 2001
From: Josh Cummings <josh.cummings@gmail.com>
Date: Thu, 3 Dec 2020 13:05:25 -0700
Subject: [PATCH] Polish getRemoteUser

- Corrected instanceof check

Issue gh-3357
---
 .../servletapi/SecurityContextHolderAwareRequestWrapper.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/src/main/java/org/springframework/security/web/servletapi/SecurityContextHolderAwareRequestWrapper.java b/web/src/main/java/org/springframework/security/web/servletapi/SecurityContextHolderAwareRequestWrapper.java
index 6b64afa4d2..612c73893a 100644
--- a/web/src/main/java/org/springframework/security/web/servletapi/SecurityContextHolderAwareRequestWrapper.java
+++ b/web/src/main/java/org/springframework/security/web/servletapi/SecurityContextHolderAwareRequestWrapper.java
@@ -107,8 +107,8 @@ public class SecurityContextHolderAwareRequestWrapper extends HttpServletRequest
 		if (auth.getPrincipal() instanceof UserDetails) {
 			return ((UserDetails) auth.getPrincipal()).getUsername();
 		}
-		if (auth.getPrincipal() instanceof AbstractAuthenticationToken) {
-			return ((AbstractAuthenticationToken) auth.getPrincipal()).getName();
+		if (auth instanceof AbstractAuthenticationToken) {
+			return auth.getName();
 		}
 		return auth.getPrincipal().toString();
 	}