diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/groovy/GroovyBeanDefinitionReader.java b/spring-beans/src/main/java/org/springframework/beans/factory/groovy/GroovyBeanDefinitionReader.java index bd03bd6cc7..0961ca2855 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/groovy/GroovyBeanDefinitionReader.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/groovy/GroovyBeanDefinitionReader.java @@ -318,7 +318,6 @@ public class GroovyBeanDefinitionReader extends AbstractBeanDefinitionReader imp callable.call(this.currentBeanDefinition); } return this.currentBeanDefinition.getBeanDefinition(); - } finally { this.currentBeanDefinition = current; @@ -681,8 +680,8 @@ public class GroovyBeanDefinitionReader extends AbstractBeanDefinitionReader imp } private GroovyDynamicElementReader createDynamicElementReader(String namespace) { - XmlReaderContext readerContext = this.groovyDslXmlBeanDefinitionReader.createReaderContext(new DescriptiveResource( - "Groovy")); + XmlReaderContext readerContext = this.groovyDslXmlBeanDefinitionReader.createReaderContext( + new DescriptiveResource("Groovy")); BeanDefinitionParserDelegate delegate = new BeanDefinitionParserDelegate(readerContext); boolean decorating = (this.currentBeanDefinition != null); if (!decorating) { @@ -776,7 +775,7 @@ public class GroovyBeanDefinitionReader extends AbstractBeanDefinitionReader imp /** - * Wraps a bean definition property an ensures that any RuntimeBeanReference + * Wraps a bean definition property and ensures that any RuntimeBeanReference * additions to it are deferred for resolution later. */ private class GroovyPropertyValue extends GroovyObjectSupport { diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultSingletonBeanRegistry.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultSingletonBeanRegistry.java index 62a3385c4f..f765e8b4e8 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultSingletonBeanRegistry.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultSingletonBeanRegistry.java @@ -610,6 +610,7 @@ public class DefaultSingletonBeanRegistry extends SimpleAliasRegistry implements * should not have their own mutexes involved in singleton creation, * to avoid the potential for deadlocks in lazy-init situations. */ + @Override public final Object getSingletonMutex() { return this.singletonObjects; } diff --git a/spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/JCacheAspectSupport.java b/spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/JCacheAspectSupport.java index dca7f6135f..893e4a6b79 100644 --- a/spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/JCacheAspectSupport.java +++ b/spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/JCacheAspectSupport.java @@ -88,6 +88,7 @@ public class JCacheAspectSupport extends AbstractCacheInvoker implements Initial return this.cacheOperationSource; } + @Override public void afterPropertiesSet() { getCacheOperationSource();