markt 2004/07/25 14:01:39
Modified: jasper2/src/share/org/apache/jasper/servlet Tag:
tomcat_4_branch JasperLoader.java
Log:
Fix bug 30306. Port Jan's security manager patch from TC5 branch (1.4 -> 1.5).
Only ported changes related to this bug.
Revision Changes Path
No revision
No revision
1.3.2.3 +3 -3
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/servlet/JasperLoader.java
Index: JasperLoader.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/servlet/JasperLoader.java,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -u -r1.3.2.2 -r1.3.2.3
--- JasperLoader.java 25 Jul 2004 20:50:21 -0000 1.3.2.2
+++ JasperLoader.java 25 Jul 2004 21:01:38 -0000 1.3.2.3
@@ -166,7 +166,7 @@
// (.5) Permission to access this class when using a SecurityManager
int dot = name.lastIndexOf('.');
- if (System.getSecurityManager() != null) {
+ if (securityManager != null) {
if (dot >= 0) {
try {
securityManager.checkPackageAccess(name.substring(0,dot));
@@ -182,7 +182,7 @@
// Class is in a package, delegate to thread context class loader
if( !name.startsWith(Constants.JSP_PACKAGE_NAME) ) {
ClassLoader classLoader = null;
- if (System.getSecurityManager() != null) {
+ if (securityManager != null) {
classLoader =
(ClassLoader)AccessController.doPrivileged(privLoadClass);
} else {
classLoader = Thread.currentThread().getContextClassLoader();
@@ -200,7 +200,7 @@
byte [] cdata = loadClassDataFromFile(classFile);
if( cdata == null )
throw new ClassNotFoundException(name);
- if( System.getSecurityManager() != null ) {
+ if( securityManager != null ) {
ProtectionDomain pd = new ProtectionDomain(
codeSource,permissionCollection);
clazz = defineClass(name,cdata,0,cdata.length,pd);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
