Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
9bd040cb
Commit
9bd040cb
authored
Sep 26, 2020
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '2.2.x' into 2.3.x
Closes gh-23500
parents
f53b0316
e74f7779
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
PropertiesLauncher.java
...a/org/springframework/boot/loader/PropertiesLauncher.java
+3
-2
No files found.
spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/PropertiesLauncher.java
View file @
9bd040cb
...
@@ -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
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment