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
5560af73
Commit
5560af73
authored
Dec 01, 2016
by
Stephane Nicoll
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #7539 from oscr:use-allAll
* pr/7539: Use addAll instead of manual array to collection copy
parents
ef6130e2
0a1009bc
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
6 deletions
+3
-6
RestartServer.java
...framework/boot/devtools/restart/server/RestartServer.java
+2
-3
ConfigurationWarningsApplicationContextInitializer.java
...t/ConfigurationWarningsApplicationContextInitializer.java
+1
-3
No files found.
spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/server/RestartServer.java
100644 → 100755
View file @
5560af73
...
@@ -20,6 +20,7 @@ import java.io.File;
...
@@ -20,6 +20,7 @@ import java.io.File;
import
java.io.IOException
;
import
java.io.IOException
;
import
java.net.URL
;
import
java.net.URL
;
import
java.net.URLClassLoader
;
import
java.net.URLClassLoader
;
import
java.util.Collections
;
import
java.util.LinkedHashSet
;
import
java.util.LinkedHashSet
;
import
java.util.Map.Entry
;
import
java.util.Map.Entry
;
import
java.util.Set
;
import
java.util.Set
;
...
@@ -141,9 +142,7 @@ public class RestartServer {
...
@@ -141,9 +142,7 @@ public class RestartServer {
ClassLoader
classLoader
=
this
.
classLoader
;
ClassLoader
classLoader
=
this
.
classLoader
;
while
(
classLoader
!=
null
)
{
while
(
classLoader
!=
null
)
{
if
(
classLoader
instanceof
URLClassLoader
)
{
if
(
classLoader
instanceof
URLClassLoader
)
{
for
(
URL
url
:
((
URLClassLoader
)
classLoader
).
getURLs
())
{
Collections
.
addAll
(
urls
,
((
URLClassLoader
)
classLoader
).
getURLs
());
urls
.
add
(
url
);
}
}
}
classLoader
=
classLoader
.
getParent
();
classLoader
=
classLoader
.
getParent
();
}
}
...
...
spring-boot/src/main/java/org/springframework/boot/context/ConfigurationWarningsApplicationContextInitializer.java
100644 → 100755
View file @
5560af73
...
@@ -183,9 +183,7 @@ public class ConfigurationWarningsApplicationContextInitializer
...
@@ -183,9 +183,7 @@ public class ConfigurationWarningsApplicationContextInitializer
private
void
addPackages
(
Set
<
String
>
packages
,
String
[]
values
)
{
private
void
addPackages
(
Set
<
String
>
packages
,
String
[]
values
)
{
if
(
values
!=
null
)
{
if
(
values
!=
null
)
{
for
(
String
value
:
values
)
{
Collections
.
addAll
(
packages
,
values
);
packages
.
add
(
value
);
}
}
}
}
}
...
...
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