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

Use Math.min() in ExponentialBackOff

Browse Source 
Use Math.min() instead of doing it manually in ExponentialBackOff.

Closes gh-25381
This commit is contained in:
May
2020-07-12 17:09:15 +08:00
committed by Sam Brannen
parent abe16eeb6e
commit 490bdd11a5
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-core/src/main/java/org/springframework/util/backoff/ExponentialBackOff.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.
@@ -200,8 +200,7 @@ public class ExponentialBackOff implements BackOff {
}
else if (this.currentInterval < 0) {
long initialInterval = getInitialInterval();
this.currentInterval = (initialInterval < maxInterval
? initialInterval : maxInterval);
this.currentInterval = Math.min(initialInterval, maxInterval);
}
else {
this.currentInterval = multiplyInterval(maxInterval);
@@ -212,7 +211,7 @@ public class ExponentialBackOff implements BackOff {
private long multiplyInterval(long maxInterval) {
long i = this.currentInterval;
i *= getMultiplier();
return (i > maxInterval ? maxInterval : i);
return Math.min(i, maxInterval);
}