Browse Source

Polishing

pull/335/merge
Juergen Hoeller 13 years ago
parent
commit
365ce55a93
  1. 4
      spring-context/src/main/java/org/springframework/context/annotation/ClassPathScanningCandidateComponentProvider.java

4
spring-context/src/main/java/org/springframework/context/annotation/ClassPathScanningCandidateComponentProvider.java

@ -325,7 +325,7 @@ public class ClassPathScanningCandidateComponentProvider implements EnvironmentC @@ -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 @@ -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());
}
/**

Loading…
Cancel
Save