Skip to content

Commit db1ebf5

Browse files
committed
Polish "Handle root output directory when extracting layers"
See gh-50501
1 parent f734339 commit db1ebf5

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

  • spring-boot-project/spring-boot-tools/spring-boot-jarmode-tools/src/main/java/org/springframework/boot/jarmode/tools

spring-boot-project/spring-boot-tools/spring-boot-jarmode-tools/src/main/java/org/springframework/boot/jarmode/tools/ExtractCommand.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -373,8 +373,8 @@ private static File assertFileIsContainedInDirectory(File directory, File file,
373373
return file;
374374
}
375375

376-
private static boolean isFileContainedInDirectory(Path canonicalOutputPath, Path canonicalFilePath) {
377-
return !canonicalFilePath.equals(canonicalOutputPath) && canonicalFilePath.startsWith(canonicalOutputPath);
376+
private static boolean isFileContainedInDirectory(Path directory, Path file) {
377+
return !file.equals(directory) && file.startsWith(directory);
378378
}
379379

380380
@FunctionalInterface

0 commit comments

Comments
 (0)