From 6d80da2e3129044df2294e5c3e7fb137b9286e6a Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Sat, 26 Oct 2013 01:27:49 +0200 Subject: [PATCH] Polishing --- .../ConfigurationClassBeanDefinitionReader.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassBeanDefinitionReader.java b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassBeanDefinitionReader.java index c47d43f97c..feb6664f4a 100644 --- a/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassBeanDefinitionReader.java +++ b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassBeanDefinitionReader.java @@ -107,8 +107,8 @@ class ConfigurationClassBeanDefinitionReader { /** - * Read {@code configurationModel}, registering bean definitions with {@link #registry} - * based on its contents. + * Read {@code configurationModel}, registering bean definitions + * with the registry based on its contents. */ public void loadBeanDefinitions(Set configurationModel) { TrackedConditionEvaluator trackedConditionEvaluator = new TrackedConditionEvaluator(); @@ -140,8 +140,9 @@ class ConfigurationClassBeanDefinitionReader { } private void removeBeanDefinition(ConfigurationClass configClass) { - if (StringUtils.hasLength(configClass.getBeanName()) && this.registry.containsBeanDefinition(configClass.getBeanName())) { - this.registry.removeBeanDefinition(configClass.getBeanName()); + String beanName = configClass.getBeanName(); + if (StringUtils.hasLength(beanName) && this.registry.containsBeanDefinition(beanName)) { + this.registry.removeBeanDefinition(beanName); } } @@ -200,7 +201,7 @@ class ConfigurationClassBeanDefinitionReader { this.registry.registerAlias(beanName, alias); } - // Has this effectively been overridden before (e.g. via XML)? + // Has this effectively been overridden before (e.g. via XML)? if (isOverriddenByExistingDefinition(beanMethod, beanName)) { return; } @@ -299,7 +300,8 @@ class ConfigurationClassBeanDefinitionReader { readerInstanceCache.put(readerClass, readerInstance); } catch (Exception ex) { - throw new IllegalStateException("Could not instantiate BeanDefinitionReader class [" + readerClass.getName() + "]"); + throw new IllegalStateException( + "Could not instantiate BeanDefinitionReader class [" + readerClass.getName() + "]"); } } BeanDefinitionReader reader = readerInstanceCache.get(readerClass); @@ -375,7 +377,7 @@ class ConfigurationClassBeanDefinitionReader { /** - * Evaluate {@Code @Conditional} annotations, tracking results and taking into + * Evaluate {@code @Conditional} annotations, tracking results and taking into * account 'imported by'. */ private class TrackedConditionEvaluator {