From 40a0d957c846af1ed7110c2a787ccf8ecca64542 Mon Sep 17 00:00:00 2001 From: Steve Donie Date: Mon, 18 Nov 2019 13:00:49 -0600 Subject: [PATCH] DAT-3637 use canonical path rather than absolute path so that includeAll paths that start with . work properly --- .../java/liquibase/resource/AbstractResourceAccessor.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/liquibase-core/src/main/java/liquibase/resource/AbstractResourceAccessor.java b/liquibase-core/src/main/java/liquibase/resource/AbstractResourceAccessor.java index 32e5ece2c3..8a9f8fa5fc 100644 --- a/liquibase-core/src/main/java/liquibase/resource/AbstractResourceAccessor.java +++ b/liquibase-core/src/main/java/liquibase/resource/AbstractResourceAccessor.java @@ -79,7 +79,7 @@ protected List getRootPaths() { return rootStrings; } - protected void getContents(File rootFile, boolean recursive, boolean includeFiles, boolean includeDirectories, String basePath, Set returnSet) { + protected void getContents(File rootFile, boolean recursive, boolean includeFiles, boolean includeDirectories, String basePath, Set returnSet) throws IOException { File[] files = rootFile.listFiles(); if (files == null) { return; @@ -87,14 +87,14 @@ protected void getContents(File rootFile, boolean recursive, boolean includeFile for (File file : files) { if (file.isDirectory()) { if (includeDirectories) { - returnSet.add(convertToPath(file.getAbsolutePath())); + returnSet.add(convertToPath(file.getCanonicalPath())); } if (recursive) { getContents(file, recursive, includeFiles, includeDirectories, basePath, returnSet); } } else { if (includeFiles) { - returnSet.add(convertToPath(file.getAbsolutePath())); + returnSet.add(convertToPath(file.getCanonicalPath())); } } }