summaryrefslogtreecommitdiff
path: root/libjava/classpath/javax/security/auth/login/Configuration.java
diff options
context:
space:
mode:
Diffstat (limited to 'libjava/classpath/javax/security/auth/login/Configuration.java')
-rw-r--r--libjava/classpath/javax/security/auth/login/Configuration.java46
1 files changed, 23 insertions, 23 deletions
diff --git a/libjava/classpath/javax/security/auth/login/Configuration.java b/libjava/classpath/javax/security/auth/login/Configuration.java
index 1e0d272f19e..eb5e4a81979 100644
--- a/libjava/classpath/javax/security/auth/login/Configuration.java
+++ b/libjava/classpath/javax/security/auth/login/Configuration.java
@@ -67,29 +67,7 @@ public abstract class Configuration
SecurityManager sm = System.getSecurityManager();
if (sm != null)
sm.checkPermission (new AuthPermission ("getLoginConfiguration"));
- if (config == null)
- {
- String conf = (String) AccessController.doPrivileged
- (new PrivilegedAction()
- {
- public Object run()
- {
- return Security.getProperty ("login.configuration.provider");
- }
- });
- try
- {
- if (conf != null)
- config = (Configuration) Class.forName (conf).newInstance();
- else
- config = new NullConfiguration();
- }
- catch (Exception x)
- {
- config = new NullConfiguration();
- }
- }
- return config;
+ return getConfig();
}
public static synchronized void setConfiguration (Configuration config)
@@ -115,6 +93,28 @@ public abstract class Configuration
*/
static Configuration getConfig()
{
+ if (config == null)
+ {
+ String conf = (String) AccessController.doPrivileged
+ (new PrivilegedAction()
+ {
+ public Object run()
+ {
+ return Security.getProperty ("login.configuration.provider");
+ }
+ });
+ try
+ {
+ if (conf != null)
+ config = (Configuration) Class.forName (conf).newInstance();
+ else
+ config = new NullConfiguration();
+ }
+ catch (Exception x)
+ {
+ config = new NullConfiguration();
+ }
+ }
return config;
}
}