Browse Source

Remove superfluous not-null check in ContextLoaderUtils

pull/640/head
Sam Brannen 12 years ago
parent
commit
d126620216
  1. 16
      spring-test/src/main/java/org/springframework/test/context/ContextLoaderUtils.java

16
spring-test/src/main/java/org/springframework/test/context/ContextLoaderUtils.java

@ -502,15 +502,13 @@ abstract class ContextLoaderUtils { @@ -502,15 +502,13 @@ abstract class ContextLoaderUtils {
throw new IllegalStateException(msg, e);
}
if (resolver != null) {
profiles = resolver.resolve(declaringClass);
if (profiles == null) {
String msg = String.format(
"ActiveProfilesResolver [%s] returned a null array of bean definition profiles.",
resolverClass.getName());
logger.error(msg);
throw new IllegalStateException(msg);
}
profiles = resolver.resolve(declaringClass);
if (profiles == null) {
String msg = String.format(
"ActiveProfilesResolver [%s] returned a null array of bean definition profiles.",
resolverClass.getName());
logger.error(msg);
throw new IllegalStateException(msg);
}
}
else if (valueDeclared) {

Loading…
Cancel
Save