luehe 2005/03/30 12:27:22
Modified: jasper2/src/share/org/apache/jasper/compiler
JspDocumentParser.java
Log:
Do not add taglib to cache if it's already there, i.e., if the cache
already contains a taglib with the given uri.
This is consistent with how this is handled in the "standard" syntax case.
Revision Changes Path
1.84 +3 -1
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspDocumentParser.java
Index: JspDocumentParser.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspDocumentParser.java,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- JspDocumentParser.java 16 Aug 2004 22:35:37 -0000 1.83
+++ JspDocumentParser.java 30 Mar 2005 20:27:22 -0000 1.84
@@ -768,7 +768,9 @@
}
if (taglibInfo != null) {
- pageInfo.addTaglib(uri, taglibInfo);
+ if (pageInfo.getTaglib(uri) == null) {
+ pageInfo.addTaglib(uri, taglibInfo);
+ }
pageInfo.pushPrefixMapping(prefix, uri);
} else {
pageInfo.pushPrefixMapping(prefix, null);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
