From 365ce55a9384e112c9f5c053e034c565bd041549 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Wed, 28 Aug 2013 22:16:20 +0200 Subject: [PATCH] Polishing --- .../ClassPathScanningCandidateComponentProvider.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-context/src/main/java/org/springframework/context/annotation/ClassPathScanningCandidateComponentProvider.java b/spring-context/src/main/java/org/springframework/context/annotation/ClassPathScanningCandidateComponentProvider.java index 12f059615e4..9283f14f5d2 100644 --- a/spring-context/src/main/java/org/springframework/context/annotation/ClassPathScanningCandidateComponentProvider.java +++ b/spring-context/src/main/java/org/springframework/context/annotation/ClassPathScanningCandidateComponentProvider.java @@ -325,7 +325,7 @@ public class ClassPathScanningCandidateComponentProvider implements EnvironmentC * @return the pattern specification to be used for package searching */ protected String resolveBasePackage(String basePackage) { - return ClassUtils.convertClassNameToResourcePath(environment.resolveRequiredPlaceholders(basePackage)); + return ClassUtils.convertClassNameToResourcePath(this.environment.resolveRequiredPlaceholders(basePackage)); } /** @@ -358,7 +358,7 @@ public class ClassPathScanningCandidateComponentProvider implements EnvironmentC if (this.conditionEvaluator == null) { this.conditionEvaluator = new ConditionEvaluator(getRegistry(), getEnvironment(), getResourceLoader()); } - return !conditionEvaluator.shouldSkip(metadataReader.getAnnotationMetadata()); + return !this.conditionEvaluator.shouldSkip(metadataReader.getAnnotationMetadata()); } /**