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
8b8a4ee6
Commit
8b8a4ee6
authored
Jan 13, 2020
by
Stephane Nicoll
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Polish "Make equality checks defensive to null reference"
See gh-19540
parent
6d8b8493
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
6 deletions
+6
-6
ResourceUtils.java
...java/org/springframework/boot/cli/util/ResourceUtils.java
+1
-1
RestDocsWebTestClientBuilderCustomizer.java
...gure/restdocs/RestDocsWebTestClientBuilderCustomizer.java
+1
-1
LoaderZipEntries.java
...ramework/boot/gradle/tasks/bundling/LoaderZipEntries.java
+1
-1
Repackager.java
...ava/org/springframework/boot/loader/tools/Repackager.java
+3
-3
No files found.
spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/util/ResourceUtils.java
View file @
8b8a4ee6
/*
/*
* Copyright 2012-20
19
the original author or authors.
* Copyright 2012-20
20
the original author or authors.
*
*
* Licensed under the Apache License, Version 2.0 (the "License");
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* you may not use this file except in compliance with the License.
...
...
spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/restdocs/RestDocsWebTestClientBuilderCustomizer.java
View file @
8b8a4ee6
/*
/*
* Copyright 2012-20
19
the original author or authors.
* Copyright 2012-20
20
the original author or authors.
*
*
* Licensed under the Apache License, Version 2.0 (the "License");
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* you may not use this file except in compliance with the License.
...
...
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/LoaderZipEntries.java
View file @
8b8a4ee6
...
@@ -50,7 +50,7 @@ class LoaderZipEntries {
...
@@ -50,7 +50,7 @@ class LoaderZipEntries {
getClass
().
getResourceAsStream
(
"/META-INF/loader/spring-boot-loader.jar"
)))
{
getClass
().
getResourceAsStream
(
"/META-INF/loader/spring-boot-loader.jar"
)))
{
java
.
util
.
zip
.
ZipEntry
entry
=
loaderJar
.
getNextEntry
();
java
.
util
.
zip
.
ZipEntry
entry
=
loaderJar
.
getNextEntry
();
while
(
entry
!=
null
)
{
while
(
entry
!=
null
)
{
if
(
entry
.
isDirectory
()
&&
!
"META-INF/"
.
equals
(
entry
.
getName
()
))
{
if
(
entry
.
isDirectory
()
&&
!
entry
.
getName
().
equals
(
"META-INF/"
))
{
writeDirectory
(
new
ZipArchiveEntry
(
entry
),
zipOutputStream
);
writeDirectory
(
new
ZipArchiveEntry
(
entry
),
zipOutputStream
);
writtenDirectoriesSpec
.
add
(
entry
);
writtenDirectoriesSpec
.
add
(
entry
);
}
}
...
...
spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Repackager.java
View file @
8b8a4ee6
...
@@ -369,12 +369,12 @@ public class Repackager {
...
@@ -369,12 +369,12 @@ public class Repackager {
@Override
@Override
public
JarArchiveEntry
transform
(
JarArchiveEntry
entry
)
{
public
JarArchiveEntry
transform
(
JarArchiveEntry
entry
)
{
if
(
"META-INF/INDEX.LIST"
.
equals
(
entry
.
getName
()
))
{
if
(
entry
.
getName
().
equals
(
"META-INF/INDEX.LIST"
))
{
return
null
;
return
null
;
}
}
if
((
entry
.
getName
().
startsWith
(
"META-INF/"
)
&&
!
"META-INF/aop.xml"
.
equals
(
entry
.
getName
()
)
if
((
entry
.
getName
().
startsWith
(
"META-INF/"
)
&&
!
entry
.
getName
().
equals
(
"META-INF/aop.xml"
)
&&
!
entry
.
getName
().
endsWith
(
".kotlin_module"
))
||
entry
.
getName
().
startsWith
(
"BOOT-INF/"
)
&&
!
entry
.
getName
().
endsWith
(
".kotlin_module"
))
||
entry
.
getName
().
startsWith
(
"BOOT-INF/"
)
||
"module-info.class"
.
equals
(
entry
.
getName
()
))
{
||
entry
.
getName
().
equals
(
"module-info.class"
))
{
return
entry
;
return
entry
;
}
}
JarArchiveEntry
renamedEntry
=
new
JarArchiveEntry
(
this
.
namePrefix
+
entry
.
getName
());
JarArchiveEntry
renamedEntry
=
new
JarArchiveEntry
(
this
.
namePrefix
+
entry
.
getName
());
...
...
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