From 76ed52c2f5393964068d5ec8d3c519626512ce64 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Mon, 5 Feb 2018 16:01:14 +0000
Subject: [PATCH] Polish "Support nested jar paths in loader.path"

Closes gh-11121
---
 .../boot/loader/PropertiesLauncher.java                | 10 ++++++++--
 .../boot/loader/PropertiesLauncherTests.java           |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

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 b1eb6b2947..00f7a50a7c 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
@@ -121,6 +121,8 @@ public class PropertiesLauncher extends Launcher {
 
 	private static final Pattern WORD_SEPARATOR = Pattern.compile("\\W+");
 
+	private static final String NESTED_ARCHIVE_SEPARATOR = "!" + File.separator;
+
 	private final File home;
 
 	private List<String> paths = new ArrayList<>();
@@ -452,6 +454,7 @@ public class PropertiesLauncher extends Launcher {
 
 	private List<Archive> getClassPathArchives(String path) throws Exception {
 		String root = cleanupPath(stripFileUrlPrefix(path));
+		System.out.println(root);
 		List<Archive> lib = new ArrayList<>();
 		File file = new File(root);
 		if (!"/".equals(root)) {
@@ -483,8 +486,7 @@ 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("!")) {
+		if (isNestedArchivePath(file)) {
 			return null;
 		}
 		String name = file.getName().toLowerCase();
@@ -494,6 +496,10 @@ public class PropertiesLauncher extends Launcher {
 		return null;
 	}
 
+	private boolean isNestedArchivePath(File file) {
+		return file.getPath().contains(NESTED_ARCHIVE_SEPARATOR);
+	}
+
 	private List<Archive> getNestedArchives(String path) throws Exception {
 		Archive parent = this.parent;
 		String root = path;
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 9de725c7b4..0cdfa14540 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.