Closes gh-2516
pull/3977/merge
Stephane Nicoll 9 years ago
parent 8a8c8272d2
commit e98aac4327

@ -212,7 +212,7 @@ public class SpringApplicationContextLoader extends AbstractContextLoader {
public void processContextConfiguration( public void processContextConfiguration(
ContextConfigurationAttributes configAttributes) { ContextConfigurationAttributes configAttributes) {
super.processContextConfiguration(configAttributes); super.processContextConfiguration(configAttributes);
if (!configAttributes.hasLocations() && !configAttributes.hasClasses()) { if (!configAttributes.hasResources()) {
Class<?>[] defaultConfigClasses = detectDefaultConfigurationClasses(configAttributes Class<?>[] defaultConfigClasses = detectDefaultConfigurationClasses(configAttributes
.getDeclaringClass()); .getDeclaringClass());
configAttributes.setClasses(defaultConfigClasses); configAttributes.setClasses(defaultConfigClasses);

Loading…
Cancel
Save