[jboss-cvs] JBossAS SVN: r73949 - trunk/varia/src/main/org/jboss/security/srp/jaas.

[jboss-cvs-commits at lists.jboss.org]

Author: mmoyses
Date: 2008-06-02 14:18:51 -0400 (Mon, 02 Jun 2008)
New Revision: 73949

Modified:
   trunk/varia/src/main/org/jboss/security/srp/jaas/SRPPrincipal.java
Log:
JBAS-5575

Modified: trunk/varia/src/main/org/jboss/security/srp/jaas/SRPPrincipal.java
===================================================================
--- trunk/varia/src/main/org/jboss/security/srp/jaas/SRPPrincipal.java	2008-06-02 18:17:26 UTC (rev 73948)
+++ trunk/varia/src/main/org/jboss/security/srp/jaas/SRPPrincipal.java	2008-06-02 18:18:51 UTC (rev 73949)
@@ -32,6 +32,7 @@
 {
    /** Serial Version */
    static final long serialVersionUID = -7123071794402068344L;
+
    /** The SRP session ID, 0 == no session */
    private int sessionID;
 
@@ -40,11 +41,13 @@
    {
       this(name, 0);
    }
+
    public SRPPrincipal(String name, int sessionID)
    {
       super(name);
       this.sessionID = sessionID;
    }
+
    public SRPPrincipal(String name, Integer sessionID)
    {
       super(name);
@@ -60,16 +63,19 @@
     * Override to include the sessionID in the equality check
     * @param obj a SRPPrincipal
     * @return true of name and sessionID are equal
-    */ 
+    */
    public boolean equals(Object obj)
    {
+      if (!(obj instanceof SRPPrincipal))
+         return false;
       SRPPrincipal p = (SRPPrincipal) obj;
-      return getName().equals(p.getName()) && sessionID == getSessionID();
+      return getName().equals(p.getName()) && sessionID == p.getSessionID();
    }
+
    /**
     * Override to include sessionID in the hash
     * @return name.hashCode() + sessionID
-    */ 
+    */
    public int hashCode()
    {
       return getName().hashCode() + sessionID;