From 66c98c0a6fdf650c24ba1f5901cb961a3871fcd7 Mon Sep 17 00:00:00 2001 From: nik Date: Wed, 9 Dec 2009 12:40:36 +0300 Subject: [PATCH] fix starting Tomcat: do not skip .keystore files from conf dir --- platform/util/src/com/intellij/openapi/util/io/FileUtil.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/platform/util/src/com/intellij/openapi/util/io/FileUtil.java b/platform/util/src/com/intellij/openapi/util/io/FileUtil.java index a76c61581f..0ff6f7cd39 100644 --- a/platform/util/src/com/intellij/openapi/util/io/FileUtil.java +++ b/platform/util/src/com/intellij/openapi/util/io/FileUtil.java @@ -572,6 +572,14 @@ public class FileUtil { } public static void copyDir(File fromDir, File toDir, boolean copySystemFiles) throws IOException { + copyDir(fromDir, toDir, copySystemFiles ? null : new FileFilter() { + public boolean accept(File file) { + return !file.getName().startsWith("."); + } + }); + } + + public static void copyDir(File fromDir, File toDir, final @Nullable FileFilter filter) throws IOException { toDir.mkdirs(); if (isAncestor(fromDir, toDir, true)) { LOG.error(fromDir.getAbsolutePath() + " is ancestor of " + toDir + ". Can't copy to itself."); @@ -581,11 +589,11 @@ public class FileUtil { if(files == null) throw new IOException(CommonBundle.message("exception.directory.is.invalid", fromDir.getPath())); if(!fromDir.canRead()) throw new IOException(CommonBundle.message("exception.directory.is.not.readable", fromDir.getPath())); for (File file : files) { - if (!copySystemFiles && file.getName().startsWith(".")) { + if (filter != null && !filter.accept(file)) { continue; } if (file.isDirectory()) { - copyDir(file, new File(toDir, file.getName()), copySystemFiles); + copyDir(file, new File(toDir, file.getName()), filter); } else { copy(file, new File(toDir, file.getName())); -- 2.11.4.GIT