Remove superfluous not-null check in ContextLoaderUtils

master
Sam Brannen 11 years ago
parent 4542f362eb
commit d126620216
  1. 16
      spring-test/src/main/java/org/springframework/test/context/ContextLoaderUtils.java

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

Loading…
Cancel
Save