Author: markt
Date: Wed Nov 13 09:38:18 2013
New Revision: 1541440
URL: http://svn.apache.org/r1541440
Log:
Remove code that was written to avoid jndi:// URLs when accessing resources. It
is no longer required as jndi:// URLs are no longer returned.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java?rev=1541440&r1=1541439&r2=1541440&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java Wed
Nov 13 09:38:18 2013
@@ -154,14 +154,7 @@ public class StandardJarScanner implemen
}
URL url = null;
try {
- // File URLs are always faster to work with so use them
- // if available.
- String realPath = context.getRealPath(path);
- if (realPath == null) {
- url = context.getResource(path);
- } else {
- url = (new File(realPath)).toURI().toURL();
- }
+ url = context.getResource(path);
process(scanType, callback, url, true);
} catch (IOException e) {
log.warn(sm.getString("jarScan.webinflibFail", url),
e);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
