Correctly resolve .jar resource mountable file from temp directory (f…

…or correct checkMountableFile flag detection on Windows)
testcontainers · Jan 27, 2020 · a5e3c58 · a5e3c58
1 parent 142e585
commit a5e3c58
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/core/src/main/java/org/testcontainers/utility/MountableFile.java b/core/src/main/java/org/testcontainers/utility/MountableFile.java
@@ -242,7 +242,11 @@ private String extractClassPathResourceToTempLocation(final String hostPath) {
         // Mark temporary files/dirs for deletion at JVM shutdown
         deleteOnExit(tmpLocation.toPath());
 
-        return tmpLocation.getAbsolutePath();
+        try {
+            return tmpLocation.getCanonicalPath();
+        } catch (IOException e) {
+            throw new IllegalStateException(e);
+        }
     }
 
     private File createTempDirectory() {
@@ -371,8 +375,8 @@ public static int getUnixFileMode(final Path path) {
         try {
             int unixMode = (int) Files.readAttributes(path, "unix:mode").get("mode");
             // Truncate mode bits for z/OS
-            if ("OS/390".equals(SystemUtils.OS_NAME) || 
-                "z/OS".equals(SystemUtils.OS_NAME) || 
+            if ("OS/390".equals(SystemUtils.OS_NAME) ||
+                "z/OS".equals(SystemUtils.OS_NAME) ||
                 "zOS".equals(SystemUtils.OS_NAME) ) {
                 unixMode &= TarConstants.MAXID;
                 unixMode |= Files.isDirectory(path) ? 040000 : 0100000;