svn commit: r1633447 - in /tomcat/trunk: java/org/apache/tomcat/util/descriptor/web/JspPropertyGroup.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Tue Oct 21 20:21:08 2014
New Revision: 1633447

URL: http://svn.apache.org/r1633447
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57105
When parsing web.xml do not limit the buffer element of the jsp-property-group 
element to integer values as the allowed values are <number>kb or none.

Modified:
    
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/JspPropertyGroup.java
    tomcat/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/JspPropertyGroup.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/JspPropertyGroup.java?rev=1633447&r1=1633446&r2=1633447&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/JspPropertyGroup.java 
(original)
+++ 
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/JspPropertyGroup.java 
Tue Oct 21 20:21:08 2014
@@ -85,11 +85,11 @@ public class JspPropertyGroup {
     }
     public String getDefaultContentType() { return this.defaultContentType; }
 
-    private Integer buffer = null;
+    private String buffer = null;
     public void setBuffer(String buffer) {
-        this.buffer = Integer.valueOf(buffer);
+        this.buffer = buffer;
     }
-    public Integer getBuffer() { return this.buffer; }
+    public String getBuffer() { return this.buffer; }
 
     private Boolean errorOnUndeclaredNamespace = null;
     public void setErrorOnUndeclaredNamespace(

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1633447&r1=1633446&r2=1633447&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Oct 21 20:21:08 2014
@@ -156,6 +156,11 @@
         <bug>57089</bug>: Ensure that configuration of a session ID generator 
is
         not lost when a web application is reloaded. (markt)
       </fix>
+      <fix>
+        <bug>57105</bug>: When parsing web.xml do not limit the buffer element
+        of the jsp-property-group element to integer values as the allowed 
+        values are <code>&lt;number&gt;kb</code> or <code>none</code>. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org