Author: markt
Date: Mon Sep 14 12:42:21 2015
New Revision: 1702930
URL: http://svn.apache.org/r1702930
Log:
Refactor to remove remaining 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=1702930&r1=1702929&r2=1702930&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:42:21 2015
@@ -203,39 +203,6 @@ public abstract class RealmBase extends
/**
- * Returns the digest encoding charset.
- *
- * @return The charset (may be null) for platform default
- *
- * @deprecated This will be removed in Tomcat 9.0.x as it has been
replaced
- * by the CredentialHandler
- */
- @Deprecated
- public String getDigestEncoding() {
- CredentialHandler ch = credentialHandler;
- if (ch instanceof MessageDigestCredentialHandler) {
- return ((MessageDigestCredentialHandler) ch).getEncoding();
- }
- return null;
- }
-
-
- /**
- * @deprecated This will be removed in Tomcat 9.0.x as it has been
replaced
- * by the CredentialHandler
- */
- @Deprecated
- protected Charset getDigestCharset() throws UnsupportedEncodingException {
- String charset = getDigestEncoding();
- if (charset == null) {
- return StandardCharsets.ISO_8859_1;
- } else {
- return B2CConverter.getCharset(charset);
- }
- }
-
-
- /**
* Return the "validate certificate chains" flag.
* @return The value of the validate certificate chains flag
*/
@@ -1122,6 +1089,25 @@ public abstract class RealmBase extends
}
+ private String getDigestEncoding() {
+ CredentialHandler ch = credentialHandler;
+ if (ch instanceof MessageDigestCredentialHandler) {
+ return ((MessageDigestCredentialHandler) ch).getEncoding();
+ }
+ return null;
+ }
+
+
+ private Charset getDigestCharset() throws UnsupportedEncodingException {
+ String charset = getDigestEncoding();
+ if (charset == null) {
+ return StandardCharsets.ISO_8859_1;
+ } else {
+ return B2CConverter.getCharset(charset);
+ }
+ }
+
+
/**
* Return a short name for this Realm implementation, for use in
* log messages.
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
