JBossWeb SVN: r2606 - tags.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2015-04-14 12:04:20 -0400 (Tue, 14 Apr 2015)
New Revision: 2606
Added:
tags/JBOSSWEB_7_5_8_FINAL/
Log:
7.5.8 build
9 years
JBossWeb SVN: r2605 - branches/7.5.x.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2015-04-14 11:12:03 -0400 (Tue, 14 Apr 2015)
New Revision: 2605
Modified:
branches/7.5.x/pom.xml
Log:
7.5.8 build
Modified: branches/7.5.x/pom.xml
===================================================================
--- branches/7.5.x/pom.xml 2015-04-09 15:32:03 UTC (rev 2604)
+++ branches/7.5.x/pom.xml 2015-04-14 15:12:03 UTC (rev 2605)
@@ -33,7 +33,7 @@
<groupId>org.jboss.web</groupId>
<artifactId>jbossweb</artifactId>
- <version>7.5.7.Final</version>
+ <version>7.5.8.Final</version>
<name>JBoss Web</name>
<description>Servlet 3.0 container</description>
9 years
JBossWeb SVN: r2603 - in branches/7.5.x/src/main/java/org/apache: tomcat/util/buf and 1 other directory.
by jbossweb-commits＠lists.jboss.org
Author: aogburn
Date: 2015-04-08 17:56:18 -0400 (Wed, 08 Apr 2015)
New Revision: 2603
Modified:
branches/7.5.x/src/main/java/org/apache/catalina/connector/OutputBuffer.java
branches/7.5.x/src/main/java/org/apache/tomcat/util/buf/ByteChunk.java
Log:
[JBWEB-312] Check if the output buffer can grow before flushing it when using a writer.
Modified: branches/7.5.x/src/main/java/org/apache/catalina/connector/OutputBuffer.java
===================================================================
--- branches/7.5.x/src/main/java/org/apache/catalina/connector/OutputBuffer.java 2015-03-26 20:22:47 UTC (rev 2602)
+++ branches/7.5.x/src/main/java/org/apache/catalina/connector/OutputBuffer.java 2015-04-08 21:56:18 UTC (rev 2603)
@@ -512,7 +512,12 @@
break;
}
if (outputCharChunk.getLength() > 0) {
- bb.flushBuffer();
+ if (bb.getBuffer().length == bb.getEnd() && bb.getLength() < bb.getLimit()) {
+ // Need to expand output buffer
+ bb.makeSpace(outputCharChunk.getLength());
+ } else {
+ bb.flushBuffer();
+ }
}
}
Modified: branches/7.5.x/src/main/java/org/apache/tomcat/util/buf/ByteChunk.java
===================================================================
--- branches/7.5.x/src/main/java/org/apache/tomcat/util/buf/ByteChunk.java 2015-03-26 20:22:47 UTC (rev 2602)
+++ branches/7.5.x/src/main/java/org/apache/tomcat/util/buf/ByteChunk.java 2015-04-08 21:56:18 UTC (rev 2603)
@@ -451,11 +451,11 @@
end=start;
}
- /** Make space for len chars. If len is small, allocate
- * a reserve space too. Never grow bigger than limit.
+ /**
+ * Make space for len chars. If len is small, allocate a reserve space too.
+ * Never grow bigger than limit.
*/
- private void makeSpace(int count)
- {
+ public void makeSpace(int count) {
byte[] tmp = null;
int newSize;
9 years