From 960082dbb0ff3623fc9e0aba2b4097f627d7f7ed Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Sat, 20 Aug 2011 17:52:04 +0000 Subject: [PATCH] [SPR-8541] Oops! Fixed a minor logic error in DelegatingSmartContextLoader. --- .../test/context/support/DelegatingSmartContextLoader.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git 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 index d382b1032d..0cdbb0aeec 100644 --- 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));