Commit 9bd040cb authored by Andy Wilkinson's avatar Andy Wilkinson

Merge branch '2.2.x' into 2.3.x

Closes gh-23500
parents f53b0316 e74f7779
...@@ -44,7 +44,6 @@ import org.springframework.boot.loader.archive.Archive.EntryFilter; ...@@ -44,7 +44,6 @@ import org.springframework.boot.loader.archive.Archive.EntryFilter;
import org.springframework.boot.loader.archive.ExplodedArchive; import org.springframework.boot.loader.archive.ExplodedArchive;
import org.springframework.boot.loader.archive.JarFileArchive; import org.springframework.boot.loader.archive.JarFileArchive;
import org.springframework.boot.loader.util.SystemPropertyUtils; import org.springframework.boot.loader.util.SystemPropertyUtils;
import org.springframework.util.Assert;
/** /**
* {@link Launcher} for archives with user-configured classpath and main class via a * {@link Launcher} for archives with user-configured classpath and main class via a
...@@ -374,7 +373,9 @@ public class PropertiesLauncher extends Launcher { ...@@ -374,7 +373,9 @@ public class PropertiesLauncher extends Launcher {
if (classLoader == null) { if (classLoader == null) {
classLoader = newClassLoader(type, NO_PARAMS); classLoader = newClassLoader(type, NO_PARAMS);
} }
Assert.notNull(classLoader, () -> "Unable to create class loader for " + className); if (classLoader == null) {
throw new IllegalArgumentException("Unable to create class loader for " + className);
}
return classLoader; return classLoader;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment