[SPR-8541] Oops! Fixed a minor logic error in DelegatingSmartContextLoader.

960082db · Sam Brannen · 8ccedd45 · 960082db
隐藏空白更改
内联并排

Showing with 1 addition and 1 deletion

org.springframework.test/src/main/java/org/springframework/test/context/support/DelegatingSmartContextLoader.java ...rk/test/context/support/DelegatingSmartContextLoader.java +1 -1

未找到文件。
--- a/org.springframework.test/src/main/java/org/springframework/test/context/support/DelegatingSmartContextLoader.java
+++ b/org.springframework.test/src/main/java/org/springframework/test/context/support/DelegatingSmartContextLoader.java
@@ -123,7 +123,7 @@ public class DelegatingSmartContextLoader implements SmartContextLoader {
 	public void processContextConfiguration(final ContextConfigurationAttributes configAttributes) {

 		Assert.notNull(configAttributes, "configAttributes must not be null");
-		Assert.isTrue(configAttributes.hasLocations() && configAttributes.hasClasses(), String.format(
+		Assert.isTrue(!(configAttributes.hasLocations() && configAttributes.hasClasses()), String.format(
 			"Cannot process locations AND configuration classes for context "
 					+ "configuration %s; configure one or the other, but not both.", configAttributes));