Author: markt
Date: Wed Jan 14 16:22:32 2009
New Revision: 734577
URL: http://svn.apache.org/viewvc?rev=734577&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46462
Limit package test to just the o.a.jsp package to allow use of packages such as
o.a.jspwiki
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/jasper/servlet/JasperLoader.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=734577&r1=734576&r2=734577&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jan 14 16:22:32 2009
@@ -158,13 +158,6 @@
markt - TCK passes
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46462
- Limit package test to just the o.a.jsp package to allow use of packages such
- as o.a.jspwiki
- http://svn.apache.org/viewvc?rev=730694&view=rev
- +1: markt, remm, fhanik
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=37458
Correct sync issue that leads to NPE in rare circumstances
Patch provided by Konstantin Kolinko
Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/servlet/JasperLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/servlet/JasperLoader.java?rev=734577&r1=734576&r2=734577&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/servlet/JasperLoader.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/servlet/JasperLoader.java Wed
Jan 14 16:22:32 2009
@@ -122,7 +122,7 @@
}
}
- if( !name.startsWith(Constants.JSP_PACKAGE_NAME) ) {
+ if( !name.startsWith(Constants.JSP_PACKAGE_NAME + '.') ) {
// Class is not in org.apache.jsp, therefore, have our
// parent load it
clazz = parent.loadClass(name);
@@ -169,4 +169,4 @@
public final PermissionCollection getPermissions(CodeSource codeSource) {
return permissionCollection;
}
-}
+}
\ No newline at end of file
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=734577&r1=734576&r2=734577&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Jan 14 16:22:32 2009
@@ -355,13 +355,17 @@
Cédric Mailleux. (markt)
</fix>
<fix>
- <bug>43681</bug>: Composite expressions used for attribute values must
+ <bug>46381</bug>: Composite expressions used for attribute values must
be coerced to Strings. (markt)
</fix>
<fix>
<bug>46397</bug>: Don't pool tag instances that implement
JspIdConsumer.
(markt)
</fix>
+ <fix>
+ <bug>46462</bug>: Limit package test to just the o.a.jsp package to
+ allow use of packages such as o.a.jspwiki. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Cluster">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
