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 2001/08/02 03:43:58 UTC
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector ResponseBase.java
remm 01/08/01 18:43:58
Modified: catalina/src/share/org/apache/catalina/connector
ResponseBase.java
Log:
- Fix for bug #2946.
The trigger for the problem is that SSLSocket doesn't behave like
a standard Socket for exception handling. This patch fixes the problem,
but additional study of this bug will be needed.
Bug reported by Mauro Bertapelle <mauro.bertapelle at jmatica.com>
Revision Changes Path
1.16 +9 -6 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/ResponseBase.java
Index: ResponseBase.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/ResponseBase.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ResponseBase.java 2001/07/22 20:25:06 1.15
+++ ResponseBase.java 2001/08/02 01:43:58 1.16
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/ResponseBase.java,v 1.15 2001/07/22 20:25:06 pier Exp $
- * $Revision: 1.15 $
- * $Date: 2001/07/22 20:25:06 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/ResponseBase.java,v 1.16 2001/08/02 01:43:58 remm Exp $
+ * $Revision: 1.16 $
+ * $Date: 2001/08/02 01:43:58 $
*
* ====================================================================
*
@@ -88,7 +88,7 @@
* the connector-specific methods need to be implemented.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.15 $ $Date: 2001/07/22 20:25:06 $
+ * @version $Revision: 1.16 $ $Date: 2001/08/02 01:43:58 $
*/
public abstract class ResponseBase
@@ -606,8 +606,11 @@
committed = true;
if (bufferCount > 0) {
- output.write(buffer, 0, bufferCount);
- bufferCount = 0;
+ try {
+ output.write(buffer, 0, bufferCount);
+ } finally {
+ bufferCount = 0;
+ }
}
}