remm 2005/06/17 05:31:40
Modified: util/java/org/apache/tomcat/util/net AprEndpoint.java
http11/src/java/org/apache/coyote/http11
Http11AprProcessor.java
Log:
- Remove useless pool field in SendfileData.
Revision Changes Path
1.47 +3 -4
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/AprEndpoint.java
Index: AprEndpoint.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/AprEndpoint.java,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- AprEndpoint.java 17 Jun 2005 09:43:35 -0000 1.46
+++ AprEndpoint.java 17 Jun 2005 12:31:40 -0000 1.47
@@ -1065,7 +1065,6 @@
public long end;
// Socket and socket pool
public long socket;
- public long pool;
// Position
public long pos;
}
@@ -1246,7 +1245,7 @@
} else {
log.warn(sm.getString("endpoint.sendfile.addfail", "" + rv));
// Can't do anything: close the socket
right away
- Pool.destroy(data.pool);
+ Socket.destroy(data.socket);
}
}
addS.clear();
@@ -1267,7 +1266,7 @@
// Destroy file descriptor pool, which
should close the file
Pool.destroy(state.fdpool);
// Close the socket, as the reponse would be
incomplete
- Pool.destroy(state.pool);
+ Socket.destroy(state.socket);
continue;
}
// Write some data using sendfile
@@ -1279,7 +1278,7 @@
remove(state);
// Close the socket, as the reponse would be
incomplete
// This will close the file too.
- Pool.destroy(state.pool);
+ Socket.destroy(state.socket);
continue;
}
1.16 +0 -1
jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11AprProcessor.java
Index: Http11AprProcessor.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11AprProcessor.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Http11AprProcessor.java 17 Jun 2005 09:43:35 -0000 1.15
+++ Http11AprProcessor.java 17 Jun 2005 12:31:40 -0000 1.16
@@ -884,7 +884,6 @@
// Do sendfile as needed: add socket to sendfile and end
if (sendfileData != null) {
sendfileData.socket = socket;
- sendfileData.pool = 0;
if (!endpoint.getSendfile().add(sendfileData)) {
keepAlive = false;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
