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

2011-08-20 17:52:04 +00:00 · 2011-08-20 17:52:04 +00:00 · 960082dbb0
parent 8ccedd452e
commit 960082dbb0
1 changed files with 1 additions and 1 deletions
--- 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));