root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Ensure non-null condition comes 1st in ternary operator 

See gh-25232
This commit is contained in:
Sam Brannen 2020-06-11 15:09:05 +02:00
parent e866fac8e7
commit bc4945d677
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-core/src/test/java/org/springframework/util/ConcurrentReferenceHashMapTests.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-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.
@ -583,7 +583,7 @@ class ConcurrentReferenceHashMapTests {
}
// For testing we want more control of the hash
this.supplementalHash = super.getHash(o);
return (o == null ? 0 : o.hashCode());
return (o != null ? o.hashCode() : 0);
}
public int getSupplementalHash() {

3
spring-web/src/main/java/org/springframework/http/client/reactive/HttpComponentsClientHttpResponse.java
View File

@ -94,8 +94,7 @@ class HttpComponentsClientHttpResponse implements ClientHttpResponse {
private long getMaxAgeSeconds(Cookie cookie) {
String maxAgeAttribute = cookie.getAttribute(Cookie.MAX_AGE_ATTR);
return (maxAgeAttribute == null ? -1 : Long.parseLong(maxAgeAttribute));
return (maxAgeAttribute != null ? Long.parseLong(maxAgeAttribute) : -1);
}
@Override

4
spring-web/src/main/java/org/springframework/web/client/DefaultResponseErrorHandler.java
View File

@ -139,7 +139,9 @@ public class DefaultResponseErrorHandler implements ResponseErrorHandler {
return preface + "[no body]";
}
charset = (charset == null ? StandardCharsets.UTF_8 : charset);
if (charset == null) {
charset = StandardCharsets.UTF_8;
}
int maxChars = 200;
if (responseBody.length < maxChars * 2) {

4
spring-web/src/main/java/org/springframework/web/filter/ForwardedHeaderFilter.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2018 the original author or authors.
* Copyright 2002-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.
@ -364,7 +364,7 @@ public class ForwardedHeaderFilter extends OncePerRequestFilter {
public String getContextPath() {
return (this.forwardedPrefix == null ? this.delegate.get().getContextPath() : this.forwardedPrefix);
return (this.forwardedPrefix != null ? this.forwardedPrefix : this.delegate.get().getContextPath());
}
public String getRequestUri() {