spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-10-05 06:29:03 +00:00
Code Issues Projects Releases Wiki Activity

Rename exception variables to clarify intent

Browse Source
This commit is contained in:
Sam Brannen
2025-08-17 19:17:27 +02:00
parent ed2fb61ce9
commit 9d57dabe2f
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-core/src/main/java/org/springframework/core/retry/RetryTemplate.java
+12 -12
View File
@@ -133,8 +133,8 @@ public class RetryTemplate implements RetryOperations {
Deque<Throwable> exceptions = new ArrayDeque<>();
exceptions.add(initialException);
Throwable retryException = initialException;
while (this.retryPolicy.shouldRetry(retryException)) {
Throwable lastException = initialException;
while (this.retryPolicy.shouldRetry(lastException)) {
try {
long duration = backOffExecution.nextBackOff();
if (duration == BackOffExecution.STOP) {
@@ -159,23 +159,23 @@ public class RetryTemplate implements RetryOperations {
.formatted(retryableName));
return result;
}
catch (Throwable currentAttemptException) {
catch (Throwable currentException) {
logger.debug(() -> "Retry attempt for operation '%s' failed due to '%s'"
.formatted(retryableName, currentAttemptException));
this.retryListener.onRetryFailure(this.retryPolicy, retryable, currentAttemptException);
exceptions.add(currentAttemptException);
retryException = currentAttemptException;
.formatted(retryableName, currentException));
this.retryListener.onRetryFailure(this.retryPolicy, retryable, currentException);
exceptions.add(currentException);
lastException = currentException;
}
}
// The RetryPolicy has exhausted at this point, so we throw a RetryException with the
// initial exception as the cause and remaining exceptions as suppressed exceptions.
RetryException finalException = new RetryException(
// last exception as the cause and remaining exceptions as suppressed exceptions.
RetryException retryException = new RetryException(
"Retry policy for operation '%s' exhausted; aborting execution".formatted(retryableName),
exceptions.removeLast());
exceptions.forEach(finalException::addSuppressed);
this.retryListener.onRetryPolicyExhaustion(this.retryPolicy, retryable, retryException);
throw finalException;
exceptions.forEach(retryException::addSuppressed);
this.retryListener.onRetryPolicyExhaustion(this.retryPolicy, retryable, lastException);
throw retryException;
}
}