Author: markt
Date: Sat Jul 4 15:55:48 2009
New Revision: 791142
URL: http://svn.apache.org/viewvc?rev=791142&view=rev
Log:
Remove some unused code
Modified:
tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java
tomcat/trunk/java/org/apache/jasper/servlet/JasperLoader.java
Modified: tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java?rev=791142&r1=791141&r2=791142&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java (original)
+++ tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java Sat Jul 4
15:55:48 2009
@@ -179,8 +179,7 @@
jspLoader = new JasperLoader
(new URL[] {baseUrl},
getClassLoader(),
- rctxt.getPermissionCollection(),
- rctxt.getCodeSource());
+ rctxt.getPermissionCollection());
}
return jspLoader;
}
Modified: tomcat/trunk/java/org/apache/jasper/servlet/JasperLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/JasperLoader.java?rev=791142&r1=791141&r2=791142&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/servlet/JasperLoader.java (original)
+++ tomcat/trunk/java/org/apache/jasper/servlet/JasperLoader.java Sat Jul 4
15:55:48 2009
@@ -37,17 +37,13 @@
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 @@
try {
is = url.openStream();
} catch (IOException e) {
- is = null;
+ // Ignore
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
