Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #21130 from richard1230

Browse Source 
* pr/21130:
  Polish contribution
  Polish

Closes gh-21130
This commit is contained in:
Stephane Nicoll
2020-04-27 10:45:16 +02:00
parent f85a0884ab 4165863859
commit fa01a1599f
4 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/cloud/CloudPlatform.java
View File

@@ -149,7 +149,7 @@ public enum CloudPlatform {
*/
public boolean isEnforced(Environment environment) {
String platform = environment.getProperty("spring.main.cloud-platform");
return (platform != null) ? name().equalsIgnoreCase(platform) : false;
return name().equalsIgnoreCase(platform);
}
/**

3
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2019 the original author or authors.
* Copyright 2012-2020 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.
@@ -232,7 +232,6 @@ public class DeferredLog implements Log {
return;
case FATAL:
log.fatal(message, throwable);
return;
}
}

5
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatGracefulShutdown.java
View File

@@ -18,6 +18,7 @@ package org.springframework.boot.web.embedded.tomcat;
import java.time.Duration;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import org.apache.catalina.Container;
@@ -106,9 +107,7 @@ class TomcatGracefulShutdown implements GracefulShutdown {
private List<Connector> getConnectors() {
List<Connector> connectors = new ArrayList<>();
for (Service service : this.tomcat.getServer().findServices()) {
for (Connector connector : service.findConnectors()) {
connectors.add(connector);
}
Collections.addAll(connectors, service.findConnectors());
}
return connectors;
}

4
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/UndertowWebServer.java
View File

@@ -251,11 +251,11 @@ public class UndertowWebServer implements WebServer {
@Override
public boolean shutDownGracefully() {
return (this.gracefulShutdown != null) ? this.gracefulShutdown.shutDownGracefully() : false;
return (this.gracefulShutdown != null) && this.gracefulShutdown.shutDownGracefully();
}
boolean inGracefulShutdown() {
return (this.gracefulShutdown != null) ? this.gracefulShutdown.isShuttingDown() : false;
return (this.gracefulShutdown != null) && this.gracefulShutdown.isShuttingDown();
}
/**