You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2015/06/15 19:16:12 UTC
svn commit: r1685633 -
/tomcat/trunk/java/javax/security/auth/message/config/AuthConfigFactory.java
Author: markt
Date: Mon Jun 15 17:16:11 2015
New Revision: 1685633
URL: http://svn.apache.org/r1685633
Log:
Extracted method for getting factory class name
Patch by fjodorver
Modified:
tomcat/trunk/java/javax/security/auth/message/config/AuthConfigFactory.java
Modified: tomcat/trunk/java/javax/security/auth/message/config/AuthConfigFactory.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/security/auth/message/config/AuthConfigFactory.java?rev=1685633&r1=1685632&r2=1685633&view=diff
==============================================================================
--- tomcat/trunk/java/javax/security/auth/message/config/AuthConfigFactory.java (original)
+++ tomcat/trunk/java/javax/security/auth/message/config/AuthConfigFactory.java Mon Jun 15 17:16:11 2015
@@ -21,6 +21,7 @@ import java.security.Permission;
import java.security.PrivilegedAction;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
+import java.security.Security;
import java.security.SecurityPermission;
import java.util.Map;
@@ -66,24 +67,15 @@ public abstract class AuthConfigFactory
public static synchronized AuthConfigFactory getFactory() {
checkPermission(getFactorySecurityPermission);
if (factory == null) {
- String className = AccessController.doPrivileged(new PrivilegedAction<String>() {
- @Override
- public String run() {
- return java.security.Security.getProperty(DEFAULT_FACTORY_SECURITY_PROPERTY);
- }
- });
- if (className == null) {
- className = DEFAULT_JASPI_AUTHCONFIGFACTORYIMPL;
- }
+ final String className = getFactoryClassName();
try {
- final String finalClassName = className;
factory = AccessController.doPrivileged(
new PrivilegedExceptionAction<AuthConfigFactory>() {
@Override
public AuthConfigFactory run() throws ClassNotFoundException,
InstantiationException, IllegalAccessException {
// TODO Review this
- Class<?> clazz = Class.forName(finalClassName, true, contextClassLoader);
+ Class<?> clazz = Class.forName(className, true, contextClassLoader);
return (AuthConfigFactory) clazz.newInstance();
}
});
@@ -134,6 +126,21 @@ public abstract class AuthConfigFactory
}
}
+ private static String getFactoryClassName() {
+ String className = AccessController.doPrivileged(new PrivilegedAction<String>() {
+ @Override
+ public String run() {
+ return Security.getProperty(DEFAULT_FACTORY_SECURITY_PROPERTY);
+ }
+ });
+
+ if (className != null) {
+ return className;
+ }
+
+ return DEFAULT_JASPI_AUTHCONFIGFACTORYIMPL;
+ }
+
public static interface RegistrationContext {
String getMessageLayer();
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org