Author: markt
Date: Fri Sep 30 19:32:32 2016
New Revision: 1762947
URL: http://svn.apache.org/viewvc?rev=1762947&view=rev
Log:
Remove references to now unused jndi: URLs
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java
tomcat/trunk/java/org/apache/tomcat/util/scan/UrlJar.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java?rev=1762947&r1=1762946&r2=1762947&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java Fri Sep
30 19:32:32 2016
@@ -507,35 +507,6 @@ public final class JspRuntimeContext {
// Allow the JSP to access
org.apache.jasper.runtime.HttpJspBase
permissions.add( new RuntimePermission(
"accessClassInPackage.org.apache.jasper.runtime") );
-
- if (parentClassLoader instanceof URLClassLoader) {
- URL [] urls =
((URLClassLoader)parentClassLoader).getURLs();
- String jarUrl = null;
- String jndiUrl = null;
- for (int i=0; i<urls.length; i++) {
- if (jndiUrl == null
- && urls[i].toString().startsWith("jndi:") ) {
- jndiUrl = urls[i].toString() + "-";
- }
- if (jarUrl == null
- && urls[i].toString().startsWith("jar:jndi:")
- ) {
- jarUrl = urls[i].toString();
- jarUrl = jarUrl.substring(0,jarUrl.length() - 2);
- jarUrl = jarUrl.substring(0,
- jarUrl.lastIndexOf('/')) + "/-";
- }
- }
- if (jarUrl != null) {
- permissions.add(
- new FilePermission(jarUrl,"read"));
- permissions.add(
- new
FilePermission(jarUrl.substring(4),"read"));
- }
- if (jndiUrl != null)
- permissions.add(
- new FilePermission(jndiUrl,"read") );
- }
} catch(Exception e) {
context.log("Security Init for context failed",e);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/scan/UrlJar.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/scan/UrlJar.java?rev=1762947&r1=1762946&r2=1762947&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/scan/UrlJar.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/scan/UrlJar.java Fri Sep 30
19:32:32 2016
@@ -23,7 +23,7 @@ import java.net.URLConnection;
/**
* Implementation of {@link org.apache.tomcat.Jar} that is optimised for
- * non-file based JAR URLs (e.g. JNDI based URLs of the form jar:jndi:...).
+ * non-file based JAR URLs.
*/
public class UrlJar extends AbstractInputStreamJar {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
