X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=security%2Fplugins%2Forg.argeo.security.equinox%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2Fequinox%2FSpringLoginModule.java;h=0e5984532099720cbc627f0be865bb13898a259a;hb=2f1c0a952d1bbaafc243da2d5d4caa235f628777;hp=298323b3d345d3fc797df404e7eddcd60b77f036;hpb=fb4f7c451ea7d9025f7cf7fe032020f229df794a;p=lgpl%2Fargeo-commons.git

diff --git a/security/plugins/org.argeo.security.equinox/src/main/java/org/argeo/security/equinox/SpringLoginModule.java b/security/plugins/org.argeo.security.equinox/src/main/java/org/argeo/security/equinox/SpringLoginModule.java
index 298323b3d..0e5984532 100644
--- a/security/plugins/org.argeo.security.equinox/src/main/java/org/argeo/security/equinox/SpringLoginModule.java
+++ b/security/plugins/org.argeo.security.equinox/src/main/java/org/argeo/security/equinox/SpringLoginModule.java
@@ -1,7 +1,6 @@
 package org.argeo.security.equinox;
 
 import java.util.Map;
-import java.util.Set;
 
 import javax.security.auth.Subject;
 import javax.security.auth.callback.Callback;
@@ -44,10 +43,11 @@ public class SpringLoginModule extends SecurityContextLoginModule {
 
 	public boolean login() throws LoginException {
 		// try to retrieve Authentication from Subject
-		Set<Authentication> auths = subject.getPrincipals(Authentication.class);
-		if (auths.size() > 0)
-			SecurityContextHolder.getContext().setAuthentication(
-					auths.iterator().next());
+		// Set<Authentication> auths =
+		// subject.getPrincipals(Authentication.class);
+		// if (auths.size() > 0)
+		// SecurityContextHolder.getContext().setAuthentication(
+		// auths.iterator().next());
 
 		// thread already logged in
 		if (SecurityContextHolder.getContext().getAuthentication() != null)
@@ -80,9 +80,7 @@ public class SpringLoginModule extends SecurityContextLoginModule {
 			callbackHandler.handle(new Callback[] { label, nameCallback,
 					passwordCallback });
 		} catch (Exception e) {
-			LoginException le = new LoginException("Callback handling failed");
-			le.initCause(e);
-			throw le;
+			throw new RuntimeException("Unexpected exception when handling", e);
 		}
 
 		// Set user name and password