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
7eb91938
Commit
7eb91938
authored
Sep 25, 2017
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Tolerate absolute URLs in manifest's Class-Path attribute
Closes gh-10268
parent
0a8b355c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
3 deletions
+8
-3
ChangeableUrls.java
...springframework/boot/devtools/restart/ChangeableUrls.java
+4
-1
ChangeableUrlsTests.java
...gframework/boot/devtools/restart/ChangeableUrlsTests.java
+4
-2
No files found.
spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/ChangeableUrls.java
View file @
7eb91938
...
@@ -143,7 +143,10 @@ final class ChangeableUrls implements Iterable<URL> {
...
@@ -143,7 +143,10 @@ final class ChangeableUrls implements Iterable<URL> {
List
<
File
>
nonExistentEntries
=
new
ArrayList
<
File
>();
List
<
File
>
nonExistentEntries
=
new
ArrayList
<
File
>();
for
(
String
entry
:
entries
)
{
for
(
String
entry
:
entries
)
{
try
{
try
{
File
referenced
=
new
File
(
parent
,
entry
);
File
referenced
=
new
File
(
entry
);
if
(!
referenced
.
isAbsolute
())
{
referenced
=
new
File
(
parent
,
entry
);
}
if
(
referenced
.
exists
())
{
if
(
referenced
.
exists
())
{
urls
.
add
(
referenced
.
toURI
().
toURL
());
urls
.
add
(
referenced
.
toURI
().
toURL
());
}
}
...
...
spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/ChangeableUrlsTests.java
View file @
7eb91938
...
@@ -75,9 +75,11 @@ public class ChangeableUrlsTests {
...
@@ -75,9 +75,11 @@ public class ChangeableUrlsTests {
@Test
@Test
public
void
urlsFromJarClassPathAreConsidered
()
throws
Exception
{
public
void
urlsFromJarClassPathAreConsidered
()
throws
Exception
{
File
relative
=
this
.
temporaryFolder
.
newFolder
();
File
relative
=
this
.
temporaryFolder
.
newFolder
();
File
absolute
=
this
.
temporaryFolder
.
newFolder
();
File
jarWithClassPath
=
makeJarFileWithUrlsInManifestClassPath
(
File
jarWithClassPath
=
makeJarFileWithUrlsInManifestClassPath
(
"project-core/target/classes/"
,
"project-web/target/classes/"
,
"project-core/target/classes/"
,
"project-web/target/classes/"
,
"does-not-exist/target/classes"
,
relative
.
getName
()
+
"/"
);
"does-not-exist/target/classes"
,
relative
.
getName
()
+
"/"
,
absolute
.
getAbsolutePath
()
+
"/"
);
new
File
(
jarWithClassPath
.
getParentFile
(),
"project-core/target/classes"
)
new
File
(
jarWithClassPath
.
getParentFile
(),
"project-core/target/classes"
)
.
mkdirs
();
.
mkdirs
();
new
File
(
jarWithClassPath
.
getParentFile
(),
"project-web/target/classes"
).
mkdirs
();
new
File
(
jarWithClassPath
.
getParentFile
(),
"project-web/target/classes"
).
mkdirs
();
...
@@ -87,7 +89,7 @@ public class ChangeableUrlsTests {
...
@@ -87,7 +89,7 @@ public class ChangeableUrlsTests {
assertThat
(
urls
.
toList
()).
containsExactly
(
assertThat
(
urls
.
toList
()).
containsExactly
(
new
URL
(
jarWithClassPath
.
toURI
().
toURL
(),
"project-core/target/classes/"
),
new
URL
(
jarWithClassPath
.
toURI
().
toURL
(),
"project-core/target/classes/"
),
new
URL
(
jarWithClassPath
.
toURI
().
toURL
(),
"project-web/target/classes/"
),
new
URL
(
jarWithClassPath
.
toURI
().
toURL
(),
"project-web/target/classes/"
),
relative
.
toURI
().
toURL
());
relative
.
toURI
().
toURL
()
,
absolute
.
toURI
().
toURL
()
);
}
}
private
URL
makeUrl
(
String
name
)
throws
IOException
{
private
URL
makeUrl
(
String
name
)
throws
IOException
{
...
...
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