Merge pull request #1037 from izeye/patch-6

* pr/1037:
  Use the defined constant in MergedContextConfiguration
master
Stephane Nicoll 9 years ago
commit b1bc920e72
  1. 2
      spring-test/src/main/java/org/springframework/test/context/MergedContextConfiguration.java

@ -245,7 +245,7 @@ public class MergedContextConfiguration implements Serializable {
MergedContextConfiguration parent) { MergedContextConfiguration parent) {
this(testClass, locations, classes, contextInitializerClasses, activeProfiles, this(testClass, locations, classes, contextInitializerClasses, activeProfiles,
propertySourceLocations, propertySourceProperties, propertySourceLocations, propertySourceProperties,
Collections.<ContextCustomizer> emptySet(), contextLoader, EMPTY_CONTEXT_CUSTOMIZERS, contextLoader,
cacheAwareContextLoaderDelegate, parent); cacheAwareContextLoaderDelegate, parent);
} }

Loading…
Cancel
Save