Merge pull request #19850 from dreis2211

wilkinsona · wilkinsona · commit ae3bdc79f35f · 2020-01-22T11:45:22.000Z
* gh-19850: Treat Java 11+'s NoSuchFileException the same as FileNotFoundException Closes gh-19850
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-layertools/src/main/java/org/springframework/boot/layertools/IndexedLayers.java b/spring-boot-project/spring-boot-tools/spring-boot-layertools/src/main/java/org/springframework/boot/layertools/IndexedLayers.java
@@ -19,6 +19,7 @@
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.NoSuchFileException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Iterator;
@@ -91,7 +92,7 @@ static IndexedLayers get(Context context) {
 			}
 			return null;
 		}
-		catch (FileNotFoundException ex) {
+		catch (FileNotFoundException | NoSuchFileException ex) {
 			return null;
 		}
 		catch (IOException ex) {

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@`
`19`	`19`	`import java.io.FileNotFoundException;`
`20`	`20`	`import java.io.IOException;`
`21`	`21`	`import java.nio.charset.StandardCharsets;`
	`22`	`+import java.nio.file.NoSuchFileException;`
`22`	`23`	`import java.util.ArrayList;`
`23`	`24`	`import java.util.Arrays;`
`24`	`25`	`import java.util.Iterator;`
`@@ -91,7 +92,7 @@ static IndexedLayers get(Context context) {`
`91`	`92`	`}`
`92`	`93`	`return null;`
`93`	`94`	`}`
`94`		`- catch (FileNotFoundException ex) {`
	`95`	`+ catch (FileNotFoundException \| NoSuchFileException ex) {`
`95`	`96`	`return null;`
`96`	`97`	`}`
`97`	`98`	`catch (IOException ex) {`