From 129242047607200da790fda767ddc63ebfa4f3d7 Mon Sep 17 00:00:00 2001
From: Ben Alex <ben.alex@springsource.com>
Date: Fri, 15 Sep 2006 03:09:05 +0000
Subject: [PATCH] SEC-311: Must observe symmetry requirement of
 Object.equals(Object) contract.

---
 core/src/main/java/org/acegisecurity/SecurityConfig.java      | 4 ----
 core/src/test/java/org/acegisecurity/SecurityConfigTests.java | 3 ++-
 2 files changed, 2 insertions(+), 5 deletions(-)

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));