root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

[SPR-7960] No longer tracking empty activated profiles.

This commit is contained in:
Sam Brannen 2011-05-31 22:12:53 +00:00
parent 67661693fe
commit c7473f9124
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
org.springframework.test/src/main/java/org/springframework/test/context/ContextLoaderUtils.java
View File

@ -18,6 +18,7 @@ package org.springframework.test.context;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import org.apache.commons.logging.Log;
@ -252,7 +253,15 @@ abstract class ContextLoaderUtils {
profiles = valueProfiles;
}
profilesList.addAll(0, Arrays.<String> asList(profiles));
if (!ObjectUtils.isEmpty(profiles)) {
Collections.reverse(Arrays.<String> asList(profiles));
for (String profile : profiles) {
if (StringUtils.hasText(profile)) {
profilesList.add(0, profile);
}
}
}
declaringClass = activateProfiles.inheritProfiles() ? AnnotationUtils.findAnnotationDeclaringClass(
annotationType, declaringClass.getSuperclass()) : null;