projects
/
lgpl
/
argeo-commons.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove deprecated warnings
[lgpl/argeo-commons.git]
/
org.argeo.cms
/
src
/
org
/
argeo
/
cms
/
auth
/
KeyringLoginModule.java
diff --git
a/org.argeo.cms/src/org/argeo/cms/auth/KeyringLoginModule.java
b/org.argeo.cms/src/org/argeo/cms/auth/KeyringLoginModule.java
index c49a59ef1dcc5ea69033618702e0caff7d8c2271..af559df7558026fc187dbf055181b86dd0deaa68 100644
(file)
--- a/
org.argeo.cms/src/org/argeo/cms/auth/KeyringLoginModule.java
+++ b/
org.argeo.cms/src/org/argeo/cms/auth/KeyringLoginModule.java
@@
-1,6
+1,5
@@
package org.argeo.cms.auth;
package org.argeo.cms.auth;
-import java.security.AccessController;
import java.util.Map;
import java.util.Set;
import java.util.Map;
import java.util.Set;
@@
-16,6
+15,7
@@
import javax.security.auth.login.LoginException;
import javax.security.auth.spi.LoginModule;
import org.argeo.cms.security.PBEKeySpecCallback;
import javax.security.auth.spi.LoginModule;
import org.argeo.cms.security.PBEKeySpecCallback;
+import org.argeo.util.CurrentSubject;
import org.argeo.util.PasswordEncryption;
/** Adds a secret key to the private credentials */
import org.argeo.util.PasswordEncryption;
/** Adds a secret key to the private credentials */
@@
-28,7
+28,7
@@
public class KeyringLoginModule implements LoginModule {
Map<String, ?> options) {
this.subject = subject;
if (subject == null) {
Map<String, ?> options) {
this.subject = subject;
if (subject == null) {
-
subject = Subject.getSubject(AccessController.getContext()
);
+
this.subject = CurrentSubject.current(
);
}
this.callbackHandler = callbackHandler;
}
}
this.callbackHandler = callbackHandler;
}