Author: markt Date: Mon Sep 14 12:41:03 2015 New Revision: 1702929 URL: http://svn.apache.org/r1702929 Log: Refactor to remove deprecated code
Modified: tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java Modified: tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java?rev=1702929&r1=1702928&r2=1702929&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java (original) +++ tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java Mon Sep 14 12:41:03 2015 @@ -203,25 +203,6 @@ public abstract class RealmBase extends /** - * Return the digest algorithm used for storing credentials. - * - * @return The currently configured algorithm used to digest stored - * credentials - * - * @deprecated This will be removed in Tomcat 9.0.x as it has been replaced - * by the CredentialHandler - */ - @Deprecated - public String getDigest() { - CredentialHandler ch = credentialHandler; - if (ch instanceof MessageDigestCredentialHandler) { - return ((MessageDigestCredentialHandler) ch).getAlgorithm(); - } - return null; - } - - - /** * Returns the digest encoding charset. * * @return The charset (may be null) for platform default @@ -1109,9 +1090,14 @@ public abstract class RealmBase extends // ------------------------------------------------------ Protected Methods protected boolean hasMessageDigest() { - return getDigest() != null; + CredentialHandler ch = credentialHandler; + if (ch instanceof MessageDigestCredentialHandler) { + return ((MessageDigestCredentialHandler) ch).getAlgorithm() != null; + } + return false; } + /** * Return the digest associated with given principal's user name. */ --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org