Merge pull request #1037 from izeye/patch-6

* pr/1037:
  Use the defined constant in MergedContextConfiguration
This commit is contained in:
Stephane Nicoll
2016-04-16 10:33:19 +02:00

View File

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