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
33a81e87
Commit
33a81e87
authored
Aug 26, 2016
by
hengyunabc
Committed by
Andy Wilkinson
Aug 31, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Avoid null handler package in JarFile protocol handler registration
Closes gh-6759
parent
63b8e82c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
1 deletion
+13
-1
JarFile.java
...ain/java/org/springframework/boot/loader/jar/JarFile.java
+1
-1
JarFileTests.java
...ava/org/springframework/boot/loader/jar/JarFileTests.java
+12
-0
No files found.
spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarFile.java
View file @
33a81e87
...
@@ -449,7 +449,7 @@ public class JarFile extends java.util.jar.JarFile implements Iterable<JarEntryD
...
@@ -449,7 +449,7 @@ public class JarFile extends java.util.jar.JarFile implements Iterable<JarEntryD
* {@link URLStreamHandler} will be located to deal with jar URLs.
* {@link URLStreamHandler} will be located to deal with jar URLs.
*/
*/
public
static
void
registerUrlProtocolHandler
()
{
public
static
void
registerUrlProtocolHandler
()
{
String
handlers
=
System
.
getProperty
(
PROTOCOL_HANDLER
);
String
handlers
=
System
.
getProperty
(
PROTOCOL_HANDLER
,
""
);
System
.
setProperty
(
PROTOCOL_HANDLER
,
(
""
.
equals
(
handlers
)
?
HANDLERS_PACKAGE
System
.
setProperty
(
PROTOCOL_HANDLER
,
(
""
.
equals
(
handlers
)
?
HANDLERS_PACKAGE
:
handlers
+
"|"
+
HANDLERS_PACKAGE
));
:
handlers
+
"|"
+
HANDLERS_PACKAGE
));
resetCachedUrlHandlers
();
resetCachedUrlHandlers
();
...
...
spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/jar/JarFileTests.java
View file @
33a81e87
...
@@ -43,10 +43,12 @@ import org.springframework.boot.loader.util.AsciiBytes;
...
@@ -43,10 +43,12 @@ import org.springframework.boot.loader.util.AsciiBytes;
import
org.springframework.util.FileCopyUtils
;
import
org.springframework.util.FileCopyUtils
;
import
org.springframework.util.StreamUtils
;
import
org.springframework.util.StreamUtils
;
import
static
org
.
hamcrest
.
Matchers
.
containsString
;
import
static
org
.
hamcrest
.
Matchers
.
equalTo
;
import
static
org
.
hamcrest
.
Matchers
.
equalTo
;
import
static
org
.
hamcrest
.
Matchers
.
greaterThan
;
import
static
org
.
hamcrest
.
Matchers
.
greaterThan
;
import
static
org
.
hamcrest
.
Matchers
.
instanceOf
;
import
static
org
.
hamcrest
.
Matchers
.
instanceOf
;
import
static
org
.
hamcrest
.
Matchers
.
is
;
import
static
org
.
hamcrest
.
Matchers
.
is
;
import
static
org
.
hamcrest
.
Matchers
.
not
;
import
static
org
.
hamcrest
.
Matchers
.
notNullValue
;
import
static
org
.
hamcrest
.
Matchers
.
notNullValue
;
import
static
org
.
hamcrest
.
Matchers
.
nullValue
;
import
static
org
.
hamcrest
.
Matchers
.
nullValue
;
import
static
org
.
hamcrest
.
Matchers
.
sameInstance
;
import
static
org
.
hamcrest
.
Matchers
.
sameInstance
;
...
@@ -63,6 +65,9 @@ import static org.mockito.Mockito.verify;
...
@@ -63,6 +65,9 @@ import static org.mockito.Mockito.verify;
* @author Andy Wilkinson
* @author Andy Wilkinson
*/
*/
public
class
JarFileTests
{
public
class
JarFileTests
{
private
static
final
String
PROTOCOL_HANDLER
=
"java.protocol.handler.pkgs"
;
private
static
final
String
HANDLERS_PACKAGE
=
"org.springframework.boot.loader"
;
@Rule
@Rule
public
ExpectedException
thrown
=
ExpectedException
.
none
();
public
ExpectedException
thrown
=
ExpectedException
.
none
();
...
@@ -453,4 +458,11 @@ public class JarFileTests {
...
@@ -453,4 +458,11 @@ public class JarFileTests {
url
.
openConnection
().
getInputStream
();
url
.
openConnection
().
getInputStream
();
}
}
@Test
public
void
registerUrlProtocolHandler
()
{
JarFile
.
registerUrlProtocolHandler
();
String
protocolHandler
=
System
.
getProperty
(
PROTOCOL_HANDLER
);
assertThat
(
protocolHandler
,
containsString
(
HANDLERS_PACKAGE
));
assertThat
(
protocolHandler
,
not
(
containsString
(
"null"
)));
}
}
}
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