Remove superfluous not-null check in ContextLoaderUtils

11 years ago · d126620216
parent 4542f362eb
commit d126620216
1 changed files with 7 additions and 9 deletions
--- a/spring-test/src/main/java/org/springframework/test/context/ContextLoaderUtils.java
+++ b/spring-test/src/main/java/org/springframework/test/context/ContextLoaderUtils.java
@ -502,7 +502,6 @@ abstract class ContextLoaderUtils {
 					throw new IllegalStateException(msg, e);
 				}

-				if (resolver != null) {
 				profiles = resolver.resolve(declaringClass);
 				if (profiles == null) {
 					String msg = String.format(
@ -512,7 +511,6 @@ abstract class ContextLoaderUtils {
 					throw new IllegalStateException(msg);
 				}
 			}
-			}
 			else if (valueDeclared) {
 				profiles = valueProfiles;
 			}