Skip to content

Commit c6f1249

Browse files
committed
Rename for clarity
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/io/trunk@1100543 13f79535-47bb-0310-9956-ffa450edef68
1 parent bdc0671 commit c6f1249

1 file changed

Lines changed: 8 additions & 8 deletions

File tree

src/main/java/org/apache/commons/io/FileUtils.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1140,8 +1140,8 @@ public static void copyDirectory(File srcDir, File destDir,
11401140
private static void doCopyDirectory(File srcDir, File destDir, FileFilter filter,
11411141
boolean preserveFileDate, List<String> exclusionList) throws IOException {
11421142
// recurse
1143-
File[] files = filter == null ? srcDir.listFiles() : srcDir.listFiles(filter);
1144-
if (files == null) { // null if abstract pathname does not denote a directory, or if an I/O error occurs
1143+
File[] srcFiles = filter == null ? srcDir.listFiles() : srcDir.listFiles(filter);
1144+
if (srcFiles == null) { // null if abstract pathname does not denote a directory, or if an I/O error occurs
11451145
throw new IOException("Failed to list contents of " + srcDir);
11461146
}
11471147
if (destDir.exists()) {
@@ -1156,13 +1156,13 @@ private static void doCopyDirectory(File srcDir, File destDir, FileFilter filter
11561156
if (destDir.canWrite() == false) {
11571157
throw new IOException("Destination '" + destDir + "' cannot be written to");
11581158
}
1159-
for (File file : files) {
1160-
File copiedFile = new File(destDir, file.getName());
1161-
if (exclusionList == null || !exclusionList.contains(file.getCanonicalPath())) {
1162-
if (file.isDirectory()) {
1163-
doCopyDirectory(file, copiedFile, filter, preserveFileDate, exclusionList);
1159+
for (File srcFile : srcFiles) {
1160+
File dstFile = new File(destDir, srcFile.getName());
1161+
if (exclusionList == null || !exclusionList.contains(srcFile.getCanonicalPath())) {
1162+
if (srcFile.isDirectory()) {
1163+
doCopyDirectory(srcFile, dstFile, filter, preserveFileDate, exclusionList);
11641164
} else {
1165-
doCopyFile(file, copiedFile, preserveFileDate);
1165+
doCopyFile(srcFile, dstFile, preserveFileDate);
11661166
}
11671167
}
11681168
}

0 commit comments

Comments
 (0)