Fixed checkstyle error, unnecesary ternary operator deleted.

manduinca · manduinca · commit 6d3539f8614f · 2019-10-05T22:22:42.000-05:00
See gh-18302
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java
@@ -537,7 +537,7 @@ public void setRemoteIpHeader(String remoteIpHeader) {
 
 		@DeprecatedConfigurationProperty(replacement = "server.tomcat.remote-ip-valve.host-header")
 		public String getHostHeader() {
-			return this.remoteIpValve.getHostHeader() == null ? this.hostHeader : this.remoteIpValve.getHostHeader();
+			return this.remoteIpValve.getHostHeader();
 		}
 
 		public void setHostHeader(String hostHeader) {

Original file line number	Diff line number	Diff line change
`@@ -537,7 +537,7 @@ public void setRemoteIpHeader(String remoteIpHeader) {`
`537`	`537`
`538`	`538`	`@DeprecatedConfigurationProperty(replacement = "server.tomcat.remote-ip-valve.host-header")`
`539`	`539`	`public String getHostHeader() {`
`540`		`- return this.remoteIpValve.getHostHeader() == null ? this.hostHeader : this.remoteIpValve.getHostHeader();`
	`540`	`+ return this.remoteIpValve.getHostHeader();`
`541`	`541`	`}`
`542`	`542`
`543`	`543`	`public void setHostHeader(String hostHeader) {`