Return-Path: X-Original-To: apmail-tomcat-dev-archive@www.apache.org Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id ACD7CB94E for ; Sun, 8 Jan 2012 18:44:44 +0000 (UTC) Received: (qmail 58094 invoked by uid 500); 8 Jan 2012 18:44:43 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 57876 invoked by uid 500); 8 Jan 2012 18:44:43 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 57867 invoked by uid 99); 8 Jan 2012 18:44:42 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 08 Jan 2012 18:44:42 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 08 Jan 2012 18:44:41 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id A205023888FD for ; Sun, 8 Jan 2012 18:44:21 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1228910 - in /tomcat/trunk/java/org/apache/tomcat/util/buf: B2CConverter.java StringCache.java Date: Sun, 08 Jan 2012 18:44:21 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120108184421.A205023888FD@eris.apache.org> Author: markt Date: Sun Jan 8 18:44:21 2012 New Revision: 1228910 URL: http://svn.apache.org/viewvc?rev=1228910&view=rev Log: Add final where necessary. Remove some unused code. Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java tomcat/trunk/java/org/apache/tomcat/util/buf/StringCache.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=1228910&r1=1228909&r2=1228910&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java Sun Jan 8 18:44:21 2012 @@ -79,14 +79,7 @@ public class B2CConverter { private IntermediateInputStream iis; private ReadConvertor conv; - private String encoding; - - /** - * @deprecated Unused. Will be removed in Tomcat 8.0.x onwards. - */ - @Deprecated - protected B2CConverter() { - } + private final String encoding; /** Create a converter, with bytes going to a byte buffer */ @@ -106,7 +99,7 @@ public class B2CConverter { } static final int BUFFER_SIZE=8192; - char result[]=new char[BUFFER_SIZE]; + final char result[]=new char[BUFFER_SIZE]; /** * Convert a buffer of bytes into a chars. Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/StringCache.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/StringCache.java?rev=1228910&r1=1228909&r2=1228910&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/buf/StringCache.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/buf/StringCache.java Sun Jan 8 18:44:21 2012 @@ -56,14 +56,15 @@ public class StringCache { "tomcat.util.buf.StringCache.cacheSize", "200")); - protected static int maxStringSize = Integer.parseInt(System.getProperty( - "tomcat.util.buf.StringCache.maxStringSize", "128")); + protected static final int maxStringSize = + Integer.parseInt(System.getProperty( + "tomcat.util.buf.StringCache.maxStringSize", "128")); /** * Statistics hash map for byte chunk. */ - protected static HashMap bcStats = + protected static final HashMap bcStats = new HashMap(cacheSize); @@ -82,7 +83,7 @@ public class StringCache { /** * Statistics hash map for char chunk. */ - protected static HashMap ccStats = + protected static final HashMap ccStats = new HashMap(cacheSize); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org