Author: jboynes
Date: Sat Jul 13 22:07:49 2013
New Revision: 1502897
URL: http://svn.apache.org/r1502897
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55259
JspProperty is the same for all patterns so only create once.
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/JspConfig.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/JspConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/JspConfig.java?rev=1502897&r1=1502896&r2=1502897&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/JspConfig.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/JspConfig.java Sat Jul 13
22:07:49 2013
@@ -95,6 +95,24 @@ public class JspConfig {
continue;
}
+ Vector<String> includePreludes = new Vector<>();
+ includePreludes.addAll(jspPropertyGroup.getIncludePreludes());
+
+ Vector<String> includeCodas = new Vector<>();
+ includeCodas.addAll(jspPropertyGroup.getIncludeCodas());
+
+ JspProperty property = new JspProperty(jspPropertyGroup.getIsXml(),
+ jspPropertyGroup.getElIgnored(),
+ jspPropertyGroup.getScriptingInvalid(),
+ jspPropertyGroup.getPageEncoding(),
+ includePreludes,
+ includeCodas,
+ jspPropertyGroup.getDeferredSyntaxAllowedAsLiteral(),
+ jspPropertyGroup.getTrimDirectiveWhitespaces(),
+ jspPropertyGroup.getDefaultContentType(),
+ jspPropertyGroup.getBuffer(),
+ jspPropertyGroup.getErrorOnUndeclaredNamespace());
+
// Add one JspPropertyGroup for each URL Pattern. This makes
// the matching logic easier.
for (String urlPattern : urlPatterns) {
@@ -137,23 +155,6 @@ public class JspConfig {
}
}
- Vector<String> includePreludes = new Vector<>();
- includePreludes.addAll(jspPropertyGroup.getIncludePreludes());
-
- Vector<String> includeCodas = new Vector<>();
- includeCodas.addAll(jspPropertyGroup.getIncludeCodas());
-
- JspProperty property = new
JspProperty(jspPropertyGroup.getIsXml(),
- jspPropertyGroup.getElIgnored(),
- jspPropertyGroup.getScriptingInvalid(),
- jspPropertyGroup.getPageEncoding(),
- includePreludes,
- includeCodas,
- jspPropertyGroup.getDeferredSyntaxAllowedAsLiteral(),
- jspPropertyGroup.getTrimDirectiveWhitespaces(),
- jspPropertyGroup.getDefaultContentType(),
- jspPropertyGroup.getBuffer(),
- jspPropertyGroup.getErrorOnUndeclaredNamespace());
JspPropertyGroup propertyGroup =
new JspPropertyGroup(path, extension, property);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
