Merge pull request #1975 from harawata/defaultvfs-invalidpathexception

harawata · web-flow · commit 749a02389303 · 2020-07-11T16:01:05.000+09:00
Catch InvalidPathException thrown under JPMS
diff --git a/src/main/java/org/apache/ibatis/io/DefaultVFS.java b/src/main/java/org/apache/ibatis/io/DefaultVFS.java
@@ -25,6 +25,7 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLEncoder;
+import java.nio.file.InvalidPathException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -105,6 +106,9 @@ public List<String> list(URL url, String path) throws IOException {
                   break;
                 }
               }
+            } catch (InvalidPathException e) {
+              // #1974
+              lines.clear();
             }
             if (!lines.isEmpty()) {
               if (log.isDebugEnabled()) {

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