Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1037 from izeye/patch-6

Browse Source 
* pr/1037:
  Use the defined constant in MergedContextConfiguration
This commit is contained in:
Stephane Nicoll
2016-04-16 10:33:19 +02:00
parent 368f29d5bc c402932ba1
commit b1bc920e72
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-test/src/main/java/org/springframework/test/context/MergedContextConfiguration.java
View File

@@ -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);
} }