From: Decebal Suiu <decebal.suiu@gmail.com>
Date: Mon, 9 Jul 2018 17:26:08 +0000 (+0300)
Subject: Fix error in getFileSystem
X-Git-Tag: release-2.4.0~6
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d3e6ecda326f38a800f0c4258d1f3b5edd7badf2;p=pf4j.git

Fix error in getFileSystem
---

diff --git a/pf4j/src/main/java/org/pf4j/util/FileUtils.java b/pf4j/src/main/java/org/pf4j/util/FileUtils.java
index a05367c..251af11 100644
--- a/pf4j/src/main/java/org/pf4j/util/FileUtils.java
+++ b/pf4j/src/main/java/org/pf4j/util/FileUtils.java
@@ -26,6 +26,7 @@ import java.io.IOException;
 import java.net.URI;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.FileSystem;
+import java.nio.file.FileSystemNotFoundException;
 import java.nio.file.FileSystems;
 import java.nio.file.FileVisitResult;
 import java.nio.file.Files;
@@ -228,9 +229,7 @@ public class FileUtils {
     }
 
     public static Path getPath(URI uri, String first, String... more) throws IOException {
-        try (FileSystem fileSystem = getFileSystem(uri)) {
-            return fileSystem.getPath(first, more);
-        }
+        return getFileSystem(uri).getPath(first, more);
     }
 
     public static Path findFile(Path directoryPath, String fileName) {
@@ -254,12 +253,11 @@ public class FileUtils {
     }
 
     private static FileSystem getFileSystem(URI uri) throws IOException {
-        FileSystem fileSystem = FileSystems.getFileSystem(uri);
-        if (fileSystem != null) {
-            return fileSystem;
+        try {
+            return FileSystems.getFileSystem(uri);
+        } catch (FileSystemNotFoundException e) {
+            return FileSystems.newFileSystem(uri, Collections.<String, String>emptyMap());
         }
-
-        return FileSystems.newFileSystem(uri, Collections.<String, String>emptyMap());
     }
 
 }