File tree Expand file tree Collapse file tree 2 files changed +4
-4
lines changed
spring-beans/src/main/java/org/springframework/beans/factory/support
spring-test/src/main/java/org/springframework/test/context Expand file tree Collapse file tree 2 files changed +4
-4
lines changed Original file line number Diff line number Diff line change @@ -587,7 +587,7 @@ else if (containsSingleton(beanName) && !containsBeanDefinition(beanName)) {
587
587
// Attempt to predict the bean type
588
588
Class <?> predictedType = null ;
589
589
590
- // We're looking for a regular reference but we're a factory bean that has
590
+ // We're looking for a regular reference, but we're a factory bean that has
591
591
// a decorated bean definition. The target bean should be the same type
592
592
// as FactoryBean would ultimately return.
593
593
if (!isFactoryDereference && dbd != null && isFactoryBean (beanName , mbd )) {
@@ -625,7 +625,7 @@ else if (containsSingleton(beanName) && !containsBeanDefinition(beanName)) {
625
625
}
626
626
else if (isFactoryDereference ) {
627
627
// Special case: A SmartInstantiationAwareBeanPostProcessor returned a non-FactoryBean
628
- // type but we nevertheless are being asked to dereference a FactoryBean...
628
+ // type, but we nevertheless are being asked to dereference a FactoryBean...
629
629
// Let's check the original bean class and proceed with it if it is a FactoryBean.
630
630
predictedType = predictBeanType (beanName , mbd , FactoryBean .class );
631
631
if (predictedType == null || !FactoryBean .class .isAssignableFrom (predictedType )) {
Original file line number Diff line number Diff line change 169
169
Class <? extends ApplicationContextInitializer <?>>[] initializers () default {};
170
170
171
171
/**
172
- * Whether or not {@linkplain #locations resource locations} or
172
+ * Whether {@linkplain #locations resource locations} or
173
173
* {@linkplain #classes <em>component classes</em>} from test superclasses
174
174
* should be <em>inherited</em>.
175
175
* <p>The default value is {@code true}. This means that an annotated test
224
224
boolean inheritLocations () default true ;
225
225
226
226
/**
227
- * Whether or not {@linkplain #initializers context initializers} from test
227
+ * Whether {@linkplain #initializers context initializers} from test
228
228
* superclasses should be <em>inherited</em>.
229
229
* <p>The default value is {@code true}. This means that an annotated test
230
230
* class will <em>inherit</em> the application context initializers defined
You can’t perform that action at this time.
0 commit comments