maxAttemptsExpression is not evaluated when an exceptionExpression is set

[shubhgup11]

@retryable doesnt seem to evaluate maxAttemptsExpression while creating the retryTemplate, if it has an exceptionExpression

This piece of code in AnnotationAwareRetryOperationsInterceptor.java should be modified i guess .

if (simple == null) {
			if (hasExpression) {
				simple = new ExpressionRetryPolicy(maxAttempts, policyMap, true, resolve(exceptionExpression),
						retryNotExcluded)
					.withBeanFactory(this.beanFactory);
			}
			else {
				simple = new SimpleRetryPolicy(maxAttempts, policyMap, true, retryNotExcluded);
				if (expression != null) {
					simple.maxAttemptsSupplier(() -> evaluate(expression, Integer.class, stateless));
				}
			}
		}

The maxAttempts supplies should be evaluated no matter , exceptionExpression is present or not.

This should be like this maybe

if (simple == null) {
			if (hasExpression) {
				simple = new ExpressionRetryPolicy(maxAttempts, policyMap, true, resolve(exceptionExpression),
						retryNotExcluded)
					.withBeanFactory(this.beanFactory);
			}
			else {
				simple = new SimpleRetryPolicy(maxAttempts, policyMap, true, retryNotExcluded);
			}
if (expression != null) {
					simple.maxAttemptsSupplier(() -> evaluate(expression, Integer.class, stateless));
				}
		}

[gaofengIt]

您好，我已经收到您的邮件，将尽快给您回复。

[garyrussell]

Confirmed - however, it only applies if retryFor (include) or noRetryFor (exclude) is provided because the expression is injected here:

spring-retry/src/main/java/org/springframework/retry/annotation/AnnotationAwareRetryOperationsInterceptor.java

Lines 375 to 385 in fa00aa1

	if (includes.length == 0 && excludes.length == 0) {
	simple = hasExpression
	? new ExpressionRetryPolicy(resolve(exceptionExpression)).withBeanFactory(this.beanFactory)
	: new SimpleRetryPolicy();
	if (expression != null) {
	simple.maxAttemptsSupplier(() -> evaluate(expression, Integer.class, stateless));
	}
	else {
	simple.setMaxAttempts(maxAttempts);
	}
	}