提交 c7473f91 编写于 作者: S Sam Brannen

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

上级 67661693
......@@ -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;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册