[jboss-svn-commits] JBL Code SVN: r21175 - labs/jbossesb/workspace/dbevenius/security/product/samples/quickstarts/helloworld_secured/src/org/jboss/soa/esb/services/security.

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

Author: beve
Date: 2008-07-22 13:35:05 -0400 (Tue, 22 Jul 2008)
New Revision: 21175

Modified:
   labs/jbossesb/workspace/dbevenius/security/product/samples/quickstarts/helloworld_secured/src/org/jboss/soa/esb/services/security/TestLoginModule.java
   labs/jbossesb/workspace/dbevenius/security/product/samples/quickstarts/helloworld_secured/src/org/jboss/soa/esb/services/security/TestPrincipal.java
Log:
Minor updates.


Modified: labs/jbossesb/workspace/dbevenius/security/product/samples/quickstarts/helloworld_secured/src/org/jboss/soa/esb/services/security/TestLoginModule.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/security/product/samples/quickstarts/helloworld_secured/src/org/jboss/soa/esb/services/security/TestLoginModule.java	2008-07-22 16:56:23 UTC (rev 21174)
+++ labs/jbossesb/workspace/dbevenius/security/product/samples/quickstarts/helloworld_secured/src/org/jboss/soa/esb/services/security/TestLoginModule.java	2008-07-22 17:35:05 UTC (rev 21175)
@@ -28,6 +28,8 @@
 import javax.security.auth.login.LoginException;
 import javax.security.auth.spi.LoginModule;
 
+import org.jboss.soa.esb.services.security.TestPrincipal;
+
 /**
  * LoginModule intended for testing perposes. <p/>
  * 
@@ -76,15 +78,13 @@
 		} 
 		else
 		{
-			principal = new TestPrincipal( username );
+			this.principal = new TestPrincipal( username );
 			if ( !subject.getPrincipals().contains( principal ) )
 			{
 				subject.getPrincipals().add( principal );
 			}
 
-			// in any case, clean out state
 			username = null;
-
 			commitSucceeded = true;
 			return true;
 		}
@@ -98,7 +98,6 @@
 		} 
 		else if ( succeeded == true && commitSucceeded == false)
 		{
-			// login succeeded but overall authentication failed
 			succeeded = false;
 			username = null;
 			principal = null;
@@ -112,8 +111,7 @@
 
 	public boolean logout() throws LoginException
 	{
-
-		subject.getPrincipals().remove( principal );
+		subject.getPrincipals().clear();
 		succeeded = false;
 		succeeded = commitSucceeded;
 		username = null;

Modified: labs/jbossesb/workspace/dbevenius/security/product/samples/quickstarts/helloworld_secured/src/org/jboss/soa/esb/services/security/TestPrincipal.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/security/product/samples/quickstarts/helloworld_secured/src/org/jboss/soa/esb/services/security/TestPrincipal.java	2008-07-22 16:56:23 UTC (rev 21174)
+++ labs/jbossesb/workspace/dbevenius/security/product/samples/quickstarts/helloworld_secured/src/org/jboss/soa/esb/services/security/TestPrincipal.java	2008-07-22 17:35:05 UTC (rev 21175)
@@ -60,5 +60,13 @@
         return ((TestPrincipal) o).name.equals(name);
     }
 
+	@Override
+	public int hashCode()
+	{
+		int result = 17;
+		result = 37 * result + (name == null ? 0 : name.hashCode());
+		return result;
+	}
 
+
 }