Author: remy.maucherat(a)jboss.com
Date: 2010-11-25 04:56:13 -0500 (Thu, 25 Nov 2010)
New Revision: 1586
Modified:
trunk/java/org/apache/jasper/compiler/ParserController.java
trunk/webapps/docs/changelog.xml
Log:
- 49998: XML syntax detection improvement.
Modified: trunk/java/org/apache/jasper/compiler/ParserController.java
===================================================================
--- trunk/java/org/apache/jasper/compiler/ParserController.java 2010-11-23 12:35:04 UTC
(rev 1585)
+++ trunk/java/org/apache/jasper/compiler/ParserController.java 2010-11-25 09:56:13 UTC
(rev 1586)
@@ -612,10 +612,12 @@
&& Character.isWhitespace(root.charAt(index))) {
index++;
}
- if (index < root.length() && root.charAt(index++) ==
'"'
- && root.regionMatches(index, JSP_URI, 0,
- JSP_URI.length())) {
- return true;
+ if (index < root.length()
+ && (root.charAt(index) == '"' ||
root.charAt(index) == '\'')) {
+ index++;
+ if (root.regionMatches(index, JSP_URI, 0, JSP_URI.length())) {
+ return true;
+ }
}
}
Modified: trunk/webapps/docs/changelog.xml
===================================================================
--- trunk/webapps/docs/changelog.xml 2010-11-23 12:35:04 UTC (rev 1585)
+++ trunk/webapps/docs/changelog.xml 2010-11-25 09:56:13 UTC (rev 1586)
@@ -49,10 +49,14 @@
<fix>
<bug>49555</bug>: Fix use of static inner classes in taglibs.
(markt)
</fix>
- <fix>
+ <fix>
<bug>49726</bug>: Specifying a default content type via a JSP
property group
should not prevent a page from setting some other content type. (markt)
</fix>
+ <fix>
+ <bug>49998</bug>: Handle single quoted attributes in detection of
jsp:root
+ element in XML syntax JSP files. (markt)
+ </fix>
</changelog>
</subsection>
</section>