User: starksm
Date: 01/07/29 08:00:07
Modified: src/main/org/jboss/security Tag: Branch_2_4
SimplePrincipal.java
Log:
Update equals method to work correctly for two objects with
a null name
Revision Changes Path
No revision
No revision
1.3.2.1 +9 -7 jboss/src/main/org/jboss/security/SimplePrincipal.java
Index: SimplePrincipal.java
===================================================================
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/security/SimplePrincipal.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- SimplePrincipal.java 2001/06/12 08:00:43 1.3
+++ SimplePrincipal.java 2001/07/29 15:00:06 1.3.2.1
@@ -26,17 +26,19 @@
}
/** Compare this SimplePrincipal's name against another SimplePrincipal
- name or null if this.getName() is null.
- @return true if name == another == null || name equals
- another.toString();
+ @return true if name equals another.toString();
*/
public boolean equals(Object another)
{
- if (name == null)
- return (another == null);
- if ((another == null) || !(another instanceof SimplePrincipal))
+ if( !(another instanceof SimplePrincipal) )
return false;
- return name.equals( another.toString() );
+ String anotherName = another.toString();
+ boolean equals = false;
+ if( name == null )
+ equals = anotherName == null;
+ else
+ equals = name.equals(anotherName);
+ return equals;
}
public int hashCode()
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development