Author: remy.maucherat(a)jboss.com Date: 2014-09-04 12:21:03 -0400 (Thu, 04 Sep 2014) New Revision: 2503 Modified: branches/7.5.x/src/main/java/org/apache/catalina/connector/Request.java Log: BZ1008041: doGetUserPrincipal will be used by getRemoteUser to be consistent with getUserPrincipal. Modified: branches/7.5.x/src/main/java/org/apache/catalina/connector/Request.java =================================================================== --- branches/7.5.x/src/main/java/org/apache/catalina/connector/Request.java 2014-09-04 15:16:55 UTC (rev 2502) +++ branches/7.5.x/src/main/java/org/apache/catalina/connector/Request.java 2014-09-04 16:21:03 UTC (rev 2503) @@ -2253,13 +2253,14 @@ * for this Request. */ public String getRemoteUser() { - - if (userPrincipal != null) { - return (userPrincipal.getName()); + Principal principal = doGetUserPrincipal(); + if (principal instanceof GenericPrincipal) { + return ((GenericPrincipal) principal).getUserPrincipal().getName(); + } else if (principal != null) { + return (principal.getName()); } else { return (null); } - } @@ -2516,8 +2517,9 @@ if (USE_PRINCIPAL_FROM_SESSION && userPrincipal == null) { Session session = doGetSession(false); Principal principal = session.getPrincipal(); - if (principal != null) - return principal; + if (principal != null) { + return principal; + } } return userPrincipal; }