remm 2002/10/10 02:45:30
Modified: coyote/src/java/org/apache/coyote/tomcat5 Constants.java
CoyoteRequest.java CoyoteResponse.java
Log:
- Recycle facades when not using the security manager (this will be
refactored further).
Revision Changes Path
1.3 +6 -0
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/Constants.java
Index: Constants.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/Constants.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Constants.java 21 Sep 2002 05:36:52 -0000 1.2
+++ Constants.java 10 Oct 2002 09:45:30 -0000 1.3
@@ -87,4 +87,10 @@
*/
public static final String SSL_CERTIFICATE_ATTR =
"org.apache.coyote.request.X509Certificate";
+ /**
+ * Security flag.
+ */
+ protected static final boolean SECURITY =
+ (System.getSecurityManager() != null);
+
}
1.5 +5 -5
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteRequest.java
Index: CoyoteRequest.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteRequest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CoyoteRequest.java 21 Sep 2002 05:36:52 -0000 1.4
+++ CoyoteRequest.java 10 Oct 2002 09:45:30 -0000 1.5
@@ -422,7 +422,7 @@
parameterMap.setLocked(false);
parameterMap.clear();
- if (facade != null) {
+ if ((Constants.SECURITY) && (facade != null)) {
facade.clear();
facade = null;
}
1.9 +5 -5
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteResponse.java
Index: CoyoteResponse.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteResponse.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- CoyoteResponse.java 4 Oct 2002 03:36:27 -0000 1.8
+++ CoyoteResponse.java 10 Oct 2002 09:45:30 -0000 1.9
@@ -315,7 +315,7 @@
error = false;
cookies.clear();
- if (facade != null) {
+ if ((Constants.SECURITY) && (facade != null)) {
facade.clear();
facade = null;
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
