diff --git a/core/src/main/java/org/acegisecurity/SecurityConfig.java b/core/src/main/java/org/acegisecurity/SecurityConfig.java index 2df626f9bb..a47bdce1de 100644 --- a/core/src/main/java/org/acegisecurity/SecurityConfig.java +++ b/core/src/main/java/org/acegisecurity/SecurityConfig.java @@ -35,10 +35,6 @@ public class SecurityConfig implements ConfigAttribute { //~ Methods ======================================================================================================== public boolean equals(Object obj) { - if (obj instanceof String) { - return obj.equals(this.attrib); - } - if (obj instanceof ConfigAttribute) { ConfigAttribute attr = (ConfigAttribute) obj; diff --git a/core/src/test/java/org/acegisecurity/SecurityConfigTests.java b/core/src/test/java/org/acegisecurity/SecurityConfigTests.java index 320901effb..2bd4677a5c 100644 --- a/core/src/test/java/org/acegisecurity/SecurityConfigTests.java +++ b/core/src/test/java/org/acegisecurity/SecurityConfigTests.java @@ -66,8 +66,9 @@ public class SecurityConfigTests extends TestCase { SecurityConfig security2 = new SecurityConfig("TEST"); assertEquals(security1, security2); + // SEC-311: Must observe symmetry requirement of Object.equals(Object) contract String securityString1 = "TEST"; - assertEquals(security1, securityString1); + assertNotSame(security1, securityString1); String securityString2 = "NOT_EQUAL"; assertTrue(!security1.equals(securityString2));