This is an automated email from the ASF dual-hosted git repository. radcortez pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 36543b8991ad219db3cb575138e80fff58747b69 Author: Roberto Cortez <[email protected]> AuthorDate: Tue Dec 18 23:32:03 2018 +0000 TOMEE-2365 - Only register JASPIC provider if AuthenticationMechanism exist in the CDI context. --- .../servlet/TomEESecurityServletContainerInitializer.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tomee/tomee-security/src/main/java/org/apache/tomee/security/servlet/TomEESecurityServletContainerInitializer.java b/tomee/tomee-security/src/main/java/org/apache/tomee/security/servlet/TomEESecurityServletContainerInitializer.java index fd49140..7eba191 100644 --- a/tomee/tomee-security/src/main/java/org/apache/tomee/security/servlet/TomEESecurityServletContainerInitializer.java +++ b/tomee/tomee-security/src/main/java/org/apache/tomee/security/servlet/TomEESecurityServletContainerInitializer.java @@ -18,7 +18,9 @@ package org.apache.tomee.security.servlet; import org.apache.tomee.security.provider.TomEESecurityAuthConfigProvider; +import javax.enterprise.inject.spi.CDI; import javax.security.auth.message.config.AuthConfigFactory; +import javax.security.enterprise.authentication.mechanism.http.HttpAuthenticationMechanism; import javax.servlet.ServletContainerInitializer; import javax.servlet.ServletContext; import javax.servlet.ServletException; @@ -27,8 +29,10 @@ import java.util.Set; public class TomEESecurityServletContainerInitializer implements ServletContainerInitializer { @Override public void onStartup(final Set<Class<?>> c, final ServletContext ctx) throws ServletException { - AuthConfigFactory.getFactory() - .registerConfigProvider(new TomEESecurityAuthConfigProvider(), null, null, - "TomEE Security JSR-375"); + if (CDI.current().select(HttpAuthenticationMechanism.class).isResolvable()) { + AuthConfigFactory.getFactory() + .registerConfigProvider(new TomEESecurityAuthConfigProvider(), null, null, + "TomEE Security JSR-375"); + } } }
