Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 54910 invoked from network); 3 Nov 2006 10:58:25 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 3 Nov 2006 10:58:24 -0000 Received: (qmail 90792 invoked by uid 500); 3 Nov 2006 10:58:29 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 90726 invoked by uid 500); 3 Nov 2006 10:58:28 -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 90715 invoked by uid 500); 3 Nov 2006 10:58:28 -0000 Delivered-To: apmail-jakarta-tomcat-dev@jakarta.apache.org Received: (qmail 90712 invoked by uid 99); 3 Nov 2006 10:58:28 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 Nov 2006 02:58:28 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 Nov 2006 02:58:16 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 622A11A9846; Fri, 3 Nov 2006 02:56:26 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r470756 - in /tomcat/tc6.0.x/trunk/java/org/apache/catalina: connector/Connector.java connector/Request.java connector/Response.java valves/ErrorReportValve.java Date: Fri, 03 Nov 2006 10:56:26 -0000 To: tomcat-dev@jakarta.apache.org From: remm@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061103105626.622A11A9846@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: remm Date: Fri Nov 3 02:56:25 2006 New Revision: 470756 URL: http://svn.apache.org/viewvc?view=rev&rev=470756 Log: - Remove an extra throwable. - Add a specific flag for recycling facades (when security is on, recycling will always be done, obviously). Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Connector.java tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Request.java tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Response.java tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Connector.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Connector.java?view=diff&rev=470756&r1=470755&r2=470756 ============================================================================== --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Connector.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Connector.java Fri Nov 3 02:56:25 2006 @@ -59,6 +59,13 @@ private static Log log = LogFactory.getLog(Connector.class); + /** + * Alternate flag to enable recycling of facades. + */ + public static final boolean RECYCLE_FACADES = + Boolean.valueOf(System.getProperty("org.apache.catalina.connector.RECYCLE_FACADES", "false")).booleanValue(); + + // ------------------------------------------------------------ Constructor Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Request.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Request.java?view=diff&rev=470756&r1=470755&r2=470756 ============================================================================== --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Request.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Request.java Fri Nov 3 02:56:25 2006 @@ -423,7 +423,7 @@ requestedSessionId = null; requestedSessionURL = false; - if (Constants.SECURITY) { + if (Constants.SECURITY || Connector.RECYCLE_FACADES) { parameterMap = new ParameterMap(); } else { parameterMap.setLocked(false); @@ -432,7 +432,7 @@ mappingData.recycle(); - if (Constants.SECURITY) { + if (Constants.SECURITY || Connector.RECYCLE_FACADES) { if (facade != null) { facade.clear(); facade = null; Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Response.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Response.java?view=diff&rev=470756&r1=470755&r2=470756 ============================================================================== --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Response.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Response.java Fri Nov 3 02:56:25 2006 @@ -268,7 +268,7 @@ cookies.clear(); - if (Constants.SECURITY) { + if (Constants.SECURITY || Connector.RECYCLE_FACADES) { if (facade != null) { facade.clear(); facade = null; Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java?view=diff&rev=470756&r1=470755&r2=470756 ============================================================================== --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java Fri Nov 3 02:56:25 2006 @@ -153,8 +153,7 @@ * a root cause exception */ protected void report(Request request, Response response, - Throwable throwable) - throws IOException { + Throwable throwable) { // Do nothing on non-HTTP responses int statusCode = response.getStatus(); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org