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
41658638
Commit
41658638
authored
Apr 27, 2020
by
Stephane Nicoll
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Polish contribution
See gh-21130
parent
a989879d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
4 deletions
+7
-4
ValueObjectBinder.java
...ework/boot/context/properties/bind/ValueObjectBinder.java
+4
-1
DeferredLog.java
...in/java/org/springframework/boot/logging/DeferredLog.java
+1
-1
TomcatGracefulShutdown.java
...work/boot/web/embedded/tomcat/TomcatGracefulShutdown.java
+2
-2
No files found.
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/ValueObjectBinder.java
View file @
41658638
...
...
@@ -117,7 +117,10 @@ class ValueObjectBinder implements DataObjectBinder {
}
private
boolean
isEmptyDefaultValueAllowed
(
Class
<?>
type
)
{
return
!
type
.
isPrimitive
()
&&
!
type
.
isEnum
()
&&
!
isAggregate
(
type
)
&&
!
type
.
getName
().
startsWith
(
"java.lang"
);
if
(
type
.
isPrimitive
()
||
type
.
isEnum
()
||
isAggregate
(
type
)
||
type
.
getName
().
startsWith
(
"java.lang"
))
{
return
false
;
}
return
true
;
}
private
boolean
isAggregate
(
Class
<?>
type
)
{
...
...
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java
View file @
41658638
/*
* 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");
* you may not use this file except in compliance with the License.
...
...
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatGracefulShutdown.java
View file @
41658638
...
...
@@ -18,7 +18,7 @@ package org.springframework.boot.web.embedded.tomcat;
import
java.time.Duration
;
import
java.util.ArrayList
;
import
java.util.
Array
s
;
import
java.util.
Collection
s
;
import
java.util.List
;
import
org.apache.catalina.Container
;
...
...
@@ -107,7 +107,7 @@ class TomcatGracefulShutdown implements GracefulShutdown {
private
List
<
Connector
>
getConnectors
()
{
List
<
Connector
>
connectors
=
new
ArrayList
<>();
for
(
Service
service
:
this
.
tomcat
.
getServer
().
findServices
())
{
connectors
.
addAll
(
Arrays
.
asList
(
service
.
findConnectors
()
));
Collections
.
addAll
(
connectors
,
service
.
findConnectors
(
));
}
return
connectors
;
}
...
...
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