Author: markt
Date: Wed Mar 19 15:20:56 2014
New Revision: 1579258
URL: http://svn.apache.org/r1579258
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56010
Allow to use JspWriter.DEFAULT_BUFFER constant with JspFactory.getPageContext
API.
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/JspFactory.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/runtime/PageContextImpl.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1558811,1574004
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1579258&r1=1579257&r2=1579258&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Mar 19 15:20:56 2014
@@ -28,14 +28,6 @@ None
PATCHES PROPOSED TO BACKPORT:
[ New proposals should be added at the end of the list ]
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56010
- Allow to use JspWriter.DEFAULT_BUFFER constant with
- JspFactory.getPageContext API.
- http://svn.apache.org/r1558811
- http://svn.apache.org/r1574004 (documentation)
- +1: kkolinko, markt, remm
- -1:
-
* Improve processing of chuck size from chunked headers. Avoid overflow and use
a bit shift instead of a multiplication as it is marginally faster.
http://people.apache.org/~markt/patches/2014-03-17-chunked-headers-tc6-v1.patch
Modified: tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/JspFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/JspFactory.java?rev=1579258&r1=1579257&r2=1579258&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/JspFactory.java (original)
+++ tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/JspFactory.java Wed Mar 19
15:20:56 2014
@@ -101,10 +101,11 @@ public abstract class JspFactory {
* @param response the current response pending on the servlet
* @param errorPageURL the URL of the error page for the requesting JSP,
or null
* @param needsSession true if the JSP participates in a session
- * @param buffer size of buffer in bytes, PageContext.NO_BUFFER if no
buffer,
- * PageContext.DEFAULT_BUFFER if implementation default.
- * @param autoflush should the buffer autoflush to the output
stream on buffer
- * overflow, or throw an IOException?
+ * @param buffer size of buffer in bytes, {@link JspWriter#NO_BUFFER}
+ * if no buffer, {@link JspWriter#DEFAULT_BUFFER}
+ * if implementation default.
+ * @param autoflush should the buffer autoflush to the output stream on
+ * buffer overflow, or throw an IOException?
*
* @return the page context
*
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/jasper/runtime/PageContextImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/runtime/PageContextImpl.java?rev=1579258&r1=1579257&r2=1579258&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/runtime/PageContextImpl.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/runtime/PageContextImpl.java
Wed Mar 19 15:20:56 2014
@@ -150,6 +150,9 @@ public class PageContextImpl extends Pag
// initialize the initial out ...
depth = -1;
+ if (bufferSize == JspWriter.DEFAULT_BUFFER) {
+ bufferSize = Constants.DEFAULT_BUFFER_SIZE;
+ }
if (this.baseOut == null) {
this.baseOut = new JspWriterImpl(response, bufferSize, autoFlush);
} else {
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1579258&r1=1579257&r2=1579258&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Mar 19 15:20:56 2014
@@ -77,6 +77,13 @@
validation of web.xml files when Jasper parses them and validateTld
controls the validation of *.tld files when Jasper parses them. (markt)
</fix>
+ <fix>
+ <bug>56010</bug>: Don't throw an
+ <code>IllegalArgumentException</code> when
+ <code>JspFactory.getPageContext</code> is used with
+ <code>JspWriter.DEFAULT_BUFFER</code>. Based on a patch by Eugene
Chung.
+ (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Web applications">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
