This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push: new 2661918 Clean-up. Remove unnecessary toString(). Better local variable name. 2661918 is described below commit 26619183c9318064c0ca4568281a422a211eccea Author: Mark Thomas <ma...@apache.org> AuthorDate: Mon Dec 2 20:55:14 2019 +0000 Clean-up. Remove unnecessary toString(). Better local variable name. --- java/org/apache/catalina/realm/CombinedRealm.java | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/java/org/apache/catalina/realm/CombinedRealm.java b/java/org/apache/catalina/realm/CombinedRealm.java index cd64d99..893c245 100644 --- a/java/org/apache/catalina/realm/CombinedRealm.java +++ b/java/org/apache/catalina/realm/CombinedRealm.java @@ -355,22 +355,18 @@ public class CombinedRealm extends RealmBase { public Principal authenticate(GSSContext gssContext, boolean storeCred) { if (gssContext.isEstablished()) { Principal authenticatedUser = null; - String username = null; - - GSSName name = null; + GSSName gssName = null; try { - name = gssContext.getSrcName(); + gssName = gssContext.getSrcName(); } catch (GSSException e) { log.warn(sm.getString("realmBase.gssNameFail"), e); return null; } - username = name.toString(); - for (Realm realm : realms) { if (log.isDebugEnabled()) { log.debug(sm.getString("combinedRealm.authStart", - username, realm.getClass().getName())); + gssName, realm.getClass().getName())); } authenticatedUser = realm.authenticate(gssContext, storeCred); @@ -378,12 +374,12 @@ public class CombinedRealm extends RealmBase { if (authenticatedUser == null) { if (log.isDebugEnabled()) { log.debug(sm.getString("combinedRealm.authFail", - username, realm.getClass().getName())); + gssName, realm.getClass().getName())); } } else { if (log.isDebugEnabled()) { log.debug(sm.getString("combinedRealm.authSuccess", - username, realm.getClass().getName())); + gssName, realm.getClass().getName())); } break; } @@ -401,12 +397,11 @@ public class CombinedRealm extends RealmBase { @Override public Principal authenticate(GSSName gssName, GSSCredential gssCredential) { Principal authenticatedUser = null; - String username = gssName.toString(); for (Realm realm : realms) { if (log.isDebugEnabled()) { log.debug(sm.getString("combinedRealm.authStart", - username, realm.getClass().getName())); + gssName, realm.getClass().getName())); } if (!(realm instanceof GSSRealm)) { @@ -423,12 +418,12 @@ public class CombinedRealm extends RealmBase { if (authenticatedUser == null) { if (log.isDebugEnabled()) { log.debug(sm.getString("combinedRealm.authFail", - username, realm.getClass().getName())); + gssName, realm.getClass().getName())); } } else { if (log.isDebugEnabled()) { log.debug(sm.getString("combinedRealm.authSuccess", - username, realm.getClass().getName())); + gssName, realm.getClass().getName())); } break; } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org