Merge pull request #2731 from harawata/jpms-file-system-exception

harawata · web-flow · commit 2e208e6cbff1 · 2022-11-12T10:13:25.000+09:00
Adding mapper could fail under JPMS
diff --git a/src/main/java/org/apache/ibatis/io/DefaultVFS.java b/src/main/java/org/apache/ibatis/io/DefaultVFS.java
@@ -26,6 +26,7 @@
 import java.net.URL;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.FileSystemException;
 import java.nio.file.InvalidPathException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -107,8 +108,8 @@ public List<String> list(URL url, String path) throws IOException {
                   break;
                 }
               }
-            } catch (InvalidPathException e) {
-              // #1974
+            } catch (InvalidPathException | FileSystemException e) {
+              // #1974 #2598
               lines.clear();
             }
             if (!lines.isEmpty()) {

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@`
`26`	`26`	`import java.net.URL;`
`27`	`27`	`import java.net.URLEncoder;`
`28`	`28`	`import java.nio.charset.StandardCharsets;`
	`29`	`+import java.nio.file.FileSystemException;`
`29`	`30`	`import java.nio.file.InvalidPathException;`
`30`	`31`	`import java.util.ArrayList;`
`31`	`32`	`import java.util.Arrays;`
`@@ -107,8 +108,8 @@ public List<String> list(URL url, String path) throws IOException {`
`107`	`108`	`break;`
`108`	`109`	`}`
`109`	`110`	`}`
`110`		`- } catch (InvalidPathException e) {`
`111`		`- // #1974`
	`111`	`+ } catch (InvalidPathException \| FileSystemException e) {`
	`112`	`+ // #1974 #2598`
`112`	`113`	`lines.clear();`
`113`	`114`	`}`
`114`	`115`	`if (!lines.isEmpty()) {`