Polishing

jhoeller · jhoeller · commit 365ce55a9384 · 2013-08-28T22:16:20.000+02:00
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
@@ -325,7 +325,7 @@ public Set<BeanDefinition> findCandidateComponents(String basePackage) {
 	 * @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 @@ private boolean isConditionMatch(MetadataReader metadataReader) {
 		if (this.conditionEvaluator == null) {
 			this.conditionEvaluator = new ConditionEvaluator(getRegistry(), getEnvironment(), getResourceLoader());
 		}
-		return !conditionEvaluator.shouldSkip(metadataReader.getAnnotationMetadata());
+		return !this.conditionEvaluator.shouldSkip(metadataReader.getAnnotationMetadata());
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -325,7 +325,7 @@ public Set<BeanDefinition> findCandidateComponents(String basePackage) {`
`325`	`325`	`* @return the pattern specification to be used for package searching`
`326`	`326`	`*/`
`327`	`327`	`protected String resolveBasePackage(String basePackage) {`
`328`		`- return ClassUtils.convertClassNameToResourcePath(environment.resolveRequiredPlaceholders(basePackage));`
	`328`	`+ return ClassUtils.convertClassNameToResourcePath(this.environment.resolveRequiredPlaceholders(basePackage));`
`329`	`329`	`}`
`330`	`330`
`331`	`331`	`/**`
`@@ -358,7 +358,7 @@ private boolean isConditionMatch(MetadataReader metadataReader) {`
`358`	`358`	`if (this.conditionEvaluator == null) {`
`359`	`359`	`this.conditionEvaluator = new ConditionEvaluator(getRegistry(), getEnvironment(), getResourceLoader());`
`360`	`360`	`}`
`361`		`- return !conditionEvaluator.shouldSkip(metadataReader.getAnnotationMetadata());`
	`361`	`+ return !this.conditionEvaluator.shouldSkip(metadataReader.getAnnotationMetadata());`
`362`	`362`	`}`
`363`	`363`
`364`	`364`	`/**`