You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2006/03/22 17:36:15 UTC
svn commit: r387887 -
/tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/AprEndpoint.java
Author: remm
Date: Wed Mar 22 08:36:13 2006
New Revision: 387887
URL: http://svn.apache.org/viewcvs?rev=387887&view=rev
Log:
- Woops, fix sizes being used.
Modified:
tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/AprEndpoint.java
Modified: tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/AprEndpoint.java
URL: http://svn.apache.org/viewcvs/tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=387887&r1=387886&r2=387887&view=diff
==============================================================================
--- tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/AprEndpoint.java Wed Mar 22 08:36:13 2006
@@ -965,16 +965,19 @@
*/
protected void init() {
pool = Pool.create(serverSockPool);
- serverPollset = allocatePoller(pollerSize, pool, soTimeout);
- if (serverPollset == 0 && pollerSize > 1024) {
- serverPollset = allocatePoller(1024, pool, soTimeout);
+ int size = pollerSize;
+ serverPollset = allocatePoller(size, pool, soTimeout);
+ if (serverPollset == 0 && size > 1024) {
+ size = 1024;
+ serverPollset = allocatePoller(size, pool, soTimeout);
}
if (serverPollset == 0) {
- serverPollset = allocatePoller(62, pool, soTimeout);
+ size = 62;
+ serverPollset = allocatePoller(size, pool, soTimeout);
}
- desc = new long[pollerSize * 2];
+ desc = new long[size * 2];
keepAliveCount = 0;
- addS = new long[pollerSize];
+ addS = new long[size];
addCount = 0;
}
@@ -1275,15 +1278,18 @@
*/
protected void init() {
pool = Pool.create(serverSockPool);
+ int size = sendfileSize;
sendfilePollset = allocatePoller(sendfileSize, pool, soTimeout);
- if (sendfilePollset == 0 && pollerSize > 1024) {
- sendfilePollset = allocatePoller(1024, pool, soTimeout);
+ if (sendfilePollset == 0 && size > 1024) {
+ size = 1024;
+ sendfilePollset = allocatePoller(size, pool, soTimeout);
}
if (sendfilePollset == 0) {
- sendfilePollset = allocatePoller(62, pool, soTimeout);
+ size = 62;
+ sendfilePollset = allocatePoller(size, pool, soTimeout);
}
- desc = new long[sendfileSize * 2];
- sendfileData = new HashMap(sendfileSize);
+ desc = new long[size * 2];
+ sendfileData = new HashMap(size);
addS = new ArrayList();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org