From: markt Date: Sat, 4 Jul 2009 15:55:48 +0000 (+0000) Subject: Remove some unused code X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=4939d8c1abad891b1e21de533488e1a03ba1621c;p=tomcat7.0 Remove some unused code git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@791142 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/java/org/apache/jasper/JspCompilationContext.java b/java/org/apache/jasper/JspCompilationContext.java index 286e17f7f..5326c0ebb 100644 --- a/java/org/apache/jasper/JspCompilationContext.java +++ b/java/org/apache/jasper/JspCompilationContext.java @@ -179,8 +179,7 @@ public class JspCompilationContext { jspLoader = new JasperLoader (new URL[] {baseUrl}, getClassLoader(), - rctxt.getPermissionCollection(), - rctxt.getCodeSource()); + rctxt.getPermissionCollection()); } return jspLoader; } diff --git a/java/org/apache/jasper/servlet/JasperLoader.java b/java/org/apache/jasper/servlet/JasperLoader.java index d7b563c11..5cb49ca09 100644 --- a/java/org/apache/jasper/servlet/JasperLoader.java +++ b/java/org/apache/jasper/servlet/JasperLoader.java @@ -37,17 +37,13 @@ import org.apache.jasper.Constants; public class JasperLoader extends URLClassLoader { private PermissionCollection permissionCollection; - private CodeSource codeSource; - private String className; private ClassLoader parent; private SecurityManager securityManager; public JasperLoader(URL[] urls, ClassLoader parent, - PermissionCollection permissionCollection, - CodeSource codeSource) { + PermissionCollection permissionCollection) { super(urls, parent); this.permissionCollection = permissionCollection; - this.codeSource = codeSource; this.parent = parent; this.securityManager = System.getSecurityManager(); } @@ -148,7 +144,7 @@ public class JasperLoader extends URLClassLoader { try { is = url.openStream(); } catch (IOException e) { - is = null; + // Ignore } } }