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: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
