Author: markt
Date: Wed Sep 9 16:01:21 2009
New Revision: 813013
URL: http://svn.apache.org/viewvc?rev=813013&view=rev
Log:
Fix additional issue related to
https://issues.apache.org/bugzilla/show_bug.cgi?id=45785
Exclude directories named *.jar for the extension validator
Also simplify isDirectory() check as that includes exists()
Based on a patch by Rolf Wojtech
Modified:
tomcat/trunk/java/org/apache/catalina/util/ExtensionValidator.java
Modified: tomcat/trunk/java/org/apache/catalina/util/ExtensionValidator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/ExtensionValidator.java?rev=813013&r1=813012&r2=813013&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/util/ExtensionValidator.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/util/ExtensionValidator.java Wed Sep
9 16:01:21 2009
@@ -91,7 +91,7 @@
String classpathItem = strTok.nextToken();
if (classpathItem.toLowerCase().endsWith(".jar")) {
File item = new File(classpathItem);
- if (item.exists()) {
+ if (item.isFile()) {
try {
addSystemResource(item);
} catch (IOException e) {
@@ -409,12 +409,13 @@
= new StringTokenizer(extensionsDir, File.pathSeparator);
while (extensionsTok.hasMoreTokens()) {
File targetDir = new File(extensionsTok.nextToken());
- if (!targetDir.exists() || !targetDir.isDirectory()) {
+ if (!targetDir.isDirectory()) {
continue;
}
File[] files = targetDir.listFiles();
for (int i = 0; i < files.length; i++) {
- if (files[i].getName().toLowerCase().endsWith(".jar")) {
+ if (files[i].getName().toLowerCase().endsWith(".jar") &&
+ files[i].isFile()) {
try {
addSystemResource(files[i]);
} catch (IOException e) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
