From 9eb8e3d4e38892d7fd9edfc0eef7d2f9fc9ca7ff Mon Sep 17 00:00:00 2001 From: hanyong Date: Thu, 23 Nov 2017 11:37:00 +0800 Subject: [PATCH] Support nested jar paths in loader.path See gh-11121 --- .../springframework/boot/loader/PropertiesLauncher.java | 4 ++++ .../boot/loader/PropertiesLauncherTests.java | 9 +++++++++ 2 files changed, 13 insertions(+) diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/PropertiesLauncher.java b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/PropertiesLauncher.java index 200b4186341..b1eb6b29478 100755 --- a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/PropertiesLauncher.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/PropertiesLauncher.java @@ -483,6 +483,10 @@ public class PropertiesLauncher extends Launcher { } private Archive getArchive(File file) throws IOException { + // Nested path never exists as plain jar file, which should be ignored here. + if (file.getPath().contains("!")) { + return null; + } String name = file.getName().toLowerCase(); if (name.endsWith(".jar") || name.endsWith(".zip")) { return new JarFileArchive(file); diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/PropertiesLauncherTests.java b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/PropertiesLauncherTests.java index ce816b92588..9de725c7b40 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/PropertiesLauncherTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/PropertiesLauncherTests.java @@ -213,6 +213,15 @@ public class PropertiesLauncherTests { assertThat(archives).areExactly(1, endingWith("app.jar!/")); } + @Test + public void testUserSpecifiedNestedJarPath() throws Exception { + System.setProperty("loader.path", "nested-jars/app.jar!/foo.jar"); + System.setProperty("loader.main", "demo.Application"); + PropertiesLauncher launcher = new PropertiesLauncher(); + List archives = launcher.getClassPathArchives(); + assertThat(archives).hasSize(1).areExactly(1, endingWith("foo.jar!/")); + } + @Test public void testUserSpecifiedDirectoryContainingJarFileWithNestedArchives() throws Exception {