diff --git a/src/main/java/org/springframework/retry/annotation/AnnotationAwareRetryOperationsInterceptor.java b/src/main/java/org/springframework/retry/annotation/AnnotationAwareRetryOperationsInterceptor.java index 9b800f5..c9e80b1 100644 --- a/src/main/java/org/springframework/retry/annotation/AnnotationAwareRetryOperationsInterceptor.java +++ b/src/main/java/org/springframework/retry/annotation/AnnotationAwareRetryOperationsInterceptor.java @@ -93,7 +93,7 @@ public class AnnotationAwareRetryOperationsInterceptor implements IntroductionIn private BeanFactory beanFactory; - private RetryListener[] defaultListeners; + private RetryListener[] globalListeners; /** * @param sleeper the sleeper to set @@ -126,13 +126,13 @@ public class AnnotationAwareRetryOperationsInterceptor implements IntroductionIn } /** - * Retry listeners to apply to all operations. - * @param defaultListeners the listeners + * Default retry listeners to apply to all operations. + * @param globalListeners the default listeners */ - public void setDefaultListeners(Collection defaultListeners) { - ArrayList retryListeners = new ArrayList(defaultListeners); + public void setListeners(Collection globalListeners) { + ArrayList retryListeners = new ArrayList(globalListeners); AnnotationAwareOrderComparator.sort(retryListeners); - this.defaultListeners = retryListeners.toArray(new RetryListener[0]); + this.globalListeners = retryListeners.toArray(new RetryListener[0]); } @Override @@ -258,8 +258,8 @@ public class AnnotationAwareRetryOperationsInterceptor implements IntroductionIn RetryTemplate template = new RetryTemplate(); if (listenersBeanNames.length > 0) { template.setListeners(getListenersBeans(listenersBeanNames)); - } else if (defaultListeners !=null) { - template.setListeners(defaultListeners); + } else if (globalListeners !=null) { + template.setListeners(globalListeners); } return template; } diff --git a/src/main/java/org/springframework/retry/annotation/RetryConfiguration.java b/src/main/java/org/springframework/retry/annotation/RetryConfiguration.java index 8ca6d40..bf95264 100644 --- a/src/main/java/org/springframework/retry/annotation/RetryConfiguration.java +++ b/src/main/java/org/springframework/retry/annotation/RetryConfiguration.java @@ -134,7 +134,7 @@ public class RetryConfiguration extends AbstractPointcutAdvisor implements Intro interceptor.setRetryContextCache(retryContextCache); } if (retryListeners != null) { - interceptor.setDefaultListeners(retryListeners); + interceptor.setListeners(retryListeners); } if (methodArgumentsKeyGenerator != null) { interceptor.setKeyGenerator(methodArgumentsKeyGenerator);