From 26410455e3ede022e6ace3435d0557ba4c18d664 Mon Sep 17 00:00:00 2001 From: markt Date: Thu, 7 Oct 2010 14:13:44 +0000 Subject: [PATCH] Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49978 Don't try to create directories that already exist git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1005457 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/catalina/loader/WebappLoader.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/java/org/apache/catalina/loader/WebappLoader.java b/java/org/apache/catalina/loader/WebappLoader.java index 132a37f93..8037cb4a1 100644 --- a/java/org/apache/catalina/loader/WebappLoader.java +++ b/java/org/apache/catalina/loader/WebappLoader.java @@ -884,9 +884,11 @@ public class WebappLoader extends LifecycleMBeanBase } else { classRepository = new File(workDir, classesPath); - if (!classRepository.mkdirs()) - throw new IOException( - sm.getString("webappLoader.mkdirFailure")); + if (!classRepository.isDirectory()) { + if (!classRepository.mkdirs()) + throw new IOException( + sm.getString("webappLoader.mkdirFailure")); + } if (!copyDir(classes, classRepository)) { throw new IOException( sm.getString("webappLoader.copyFailure")); @@ -934,9 +936,11 @@ public class WebappLoader extends LifecycleMBeanBase } else { copyJars = true; destDir = new File(workDir, libPath); - if (!destDir.mkdirs()) - throw new IOException( - sm.getString("webappLoader.mkdirFailure")); + if (!destDir.isDirectory()) { + if (!destDir.mkdirs()) + throw new IOException( + sm.getString("webappLoader.mkdirFailure")); + } } // Looking up directory /WEB-INF/lib in the context -- 2.11.0