Author: remm
Date: Tue Jun 27 06:48:36 2006
New Revision: 417457
URL: http://svn.apache.org/viewvc?rev=417457&view=rev
Log:
- As redoing the encoders and decoders won't happen immediately, save some
memory by cleaning the
cache when starting a Comet request (which is supposed to last for a while).
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/InputBuffer.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/OutputBuffer.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
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=417457&r1=417456&r2=417457&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
Tue Jun 27 06:48:36 2006
@@ -241,6 +241,11 @@
if (!comet) {
request.recycle();
response.recycle();
+ } else {
+ // Clear converters so that the minimum amount of memory
+ // is used by this processor
+ request.clearEncoders();
+ response.clearEncoders();
}
}
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/InputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/InputBuffer.java?rev=417457&r1=417456&r2=417457&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/InputBuffer.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/InputBuffer.java
Tue Jun 27 06:48:36 2006
@@ -237,6 +237,14 @@
/**
+ * Clear cached encoders (to save memory for Comet requests).
+ */
+ public void clearEncoders() {
+ encoders.clear();
+ }
+
+
+ /**
* Close the input buffer.
*
* @throws IOException An underlying IOException occurred
@@ -493,6 +501,5 @@
}
}
-
}
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/OutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/OutputBuffer.java?rev=417457&r1=417456&r2=417457&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/OutputBuffer.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/OutputBuffer.java
Tue Jun 27 06:48:36 2006
@@ -228,6 +228,14 @@
/**
+ * Clear cached encoders (to save memory for Comet requests).
+ */
+ public void clearEncoders() {
+ encoders.clear();
+ }
+
+
+ /**
* Close the output buffer. This tries to calculate the response size if
* the response has not been committed yet.
*
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?rev=417457&r1=417456&r2=417457&view=diff
==============================================================================
--- 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 Tue
Jun 27 06:48:36 2006
@@ -357,8 +357,10 @@
*/
protected String localName = null;
+
// --------------------------------------------------------- Public Methods
+
/**
* Release all object references, and initialize instance variables, in
* preparation for reuse of this object.
@@ -424,6 +426,14 @@
}
+
+ /**
+ * Clear cached encoders (to save memory for Comet requests).
+ */
+ public void clearEncoders() {
+ inputBuffer.clearEncoders();
+ }
+
// -------------------------------------------------------- Request Methods
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?rev=417457&r1=417456&r2=417457&view=diff
==============================================================================
--- 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 Tue
Jun 27 06:48:36 2006
@@ -286,6 +286,14 @@
}
+ /**
+ * Clear cached encoders (to save memory for Comet requests).
+ */
+ public void clearEncoders() {
+ outputBuffer.clearEncoders();
+ }
+
+
// ------------------------------------------------------- Response Methods
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
