Author: markt Date: Fri Apr 28 18:45:09 2017 New Revision: 1793131 URL: http://svn.apache.org/viewvc?rev=1793131&view=rev Log: Remove deprecated code
Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java?rev=1793131&r1=1793130&r2=1793131&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java Fri Apr 28 18:45:09 2017 @@ -66,32 +66,11 @@ public class B2CConverter { * @throws UnsupportedEncodingException If the requested Charset is not * available */ - public static Charset getCharset(String enc) - throws UnsupportedEncodingException { + public static Charset getCharset(String enc) throws UnsupportedEncodingException { // Encoding names should all be ASCII String lowerCaseEnc = enc.toLowerCase(Locale.ENGLISH); - return getCharsetLower(lowerCaseEnc); - } - - - /** - * Only to be used when it is known that the encoding name is in lower case. - * @param lowerCaseEnc The name of the encoding for the required charset in - * lower case - * - * @return The Charset corresponding to the requested encoding - * - * @throws UnsupportedEncodingException If the requested Charset is not - * available - * - * @deprecated Will be removed in Tomcat 9.0.x - */ - @Deprecated - public static Charset getCharsetLower(String lowerCaseEnc) - throws UnsupportedEncodingException { - Charset charset = encodingToCharsetCache.get(lowerCaseEnc); if (charset == null) { --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org