Author: markt
Date: Thu Jan 10 13:46:28 2008
New Revision: 610943
URL: http://svn.apache.org/viewvc?rev=610943&view=rev
Log:
Fix bug 43743. Correctly handle nest tag files packaged in a jar.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Parser.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=610943&r1=610942&r2=610943&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jan 10 13:46:28 2008
@@ -31,12 +31,6 @@
+1: jfclere
-1: fhanik - Can we add the 'package' directive to make the package match
the dir structure
- Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43743
- Correctly handle nest tag files packaged in a jar.
- http://svn.apache.org/viewvc?rev=609803&view=rev
- +1: markt, fhanik, pero
- -1:
-
CometProcessor should implement the Servlet interface, since it is defined
in web.xml
http://people.apache.org/~fhanik/patches/comet-interface.patch
+1: fhanik
Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Parser.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Parser.java?rev=610943&r1=610942&r2=610943&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Parser.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Parser.java Thu Jan 10
13:46:28 2008
@@ -422,6 +422,13 @@
if (ctxt.getOptions().isCaching()) {
ctxt.getOptions().getCache().put(uri, impl);
}
+ } else {
+ // Current compilation context needs location of cached
+ // tag files
+ for (TagFileInfo info : impl.getTagFiles()) {
+ ctxt.setTagFileJarUrl(info.getPath(),
+ ctxt.getTagFileJarUrl());
+ }
}
pageInfo.addTaglib(uri, impl);
}
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=610943&r1=610942&r2=610943&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Jan 10 13:46:28 2008
@@ -164,6 +164,10 @@
(markt)
</fix>
<fix>
+ <bug>43743</bug>: Fix NPE when compiling nest tag files packaged in a
+ JAR. (markt)
+ </fix>
+ <fix>
<bug>43757</bug>: Rather than use string matching to work out the line
in the JSP with the error, use the SMAP info and the knowledge that for
a scriptlet there is a one to one line mapping. (markt/jim)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
