yoavs 2005/03/23 07:41:47
Modified: webapps/docs changelog.xml
jasper2/src/share/org/apache/jasper/compiler
TagLibraryInfoImpl.java
Log:
Bugzilla 33538.
Revision Changes Path
1.248 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -r1.247 -r1.248
--- changelog.xml 23 Mar 2005 15:30:56 -0000 1.247
+++ changelog.xml 23 Mar 2005 15:41:47 -0000 1.248
@@ -260,6 +260,9 @@
<fix>
<bug>33373</bug>: Fix handling of context classloader in jspc (remm)
</fix>
+ <fix>
+ <bug>33538</bug>: Ignore example and tag-extension elements in
TagLibraryInfoImpl. (yoavs)
+ </fix>
</changelog>
</subsection>
1.58 +4 -0
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java
Index: TagLibraryInfoImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- TagLibraryInfoImpl.java 21 Mar 2005 15:38:12 -0000 1.57
+++ TagLibraryInfoImpl.java 23 Mar 2005 15:41:47 -0000 1.58
@@ -473,6 +473,10 @@
name = child.getBody();
} else if ("path".equals(tname)) {
path = child.getBody();
+ } else if ("example".equals(tname)) {
+ // Ignore <example> element: Bugzilla 33538
+ } else if ("tag-extension".equals(tname)) {
+ // Ignore <tag-extension> element: Bugzilla 33538
} else {
if (log.isWarnEnabled()) {
log.warn(Localizer.getMessage(
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
