From eb71cfd096bcb2fc7b9e86707178d4a93a496544 Mon Sep 17 00:00:00 2001 From: Jared Anderson Date: Thu, 23 Jan 2025 15:27:48 -0600 Subject: [PATCH] Update EJB and Web JaccService to not be immediate=true - When restructuring the JaccServiceImpl code the EJB and Web versions were made immediate=true when the original JaccServiceImpl was not which causes some side effects where things were initialized in the wrong order. This change fixes it. --- .../authorization/jacc/ejb/impl/EJBJaccServiceImpl.java | 4 ++-- .../authorization/jacc/web/impl/WebJaccServiceImpl.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dev/com.ibm.ws.security.authorization.jacc.ejb/src/com/ibm/ws/security/authorization/jacc/ejb/impl/EJBJaccServiceImpl.java b/dev/com.ibm.ws.security.authorization.jacc.ejb/src/com/ibm/ws/security/authorization/jacc/ejb/impl/EJBJaccServiceImpl.java index 1702336fb87b..47f79a577056 100644 --- a/dev/com.ibm.ws.security.authorization.jacc.ejb/src/com/ibm/ws/security/authorization/jacc/ejb/impl/EJBJaccServiceImpl.java +++ b/dev/com.ibm.ws.security.authorization.jacc.ejb/src/com/ibm/ws/security/authorization/jacc/ejb/impl/EJBJaccServiceImpl.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2024 IBM Corporation and others. + * Copyright (c) 2024, 2025 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at @@ -52,7 +52,7 @@ import com.ibm.ws.security.authorization.jacc.ejb.EJBSecurityPropagator; import com.ibm.wsspi.kernel.service.utils.AtomicServiceReference; -@Component(service = EJBJaccService.class, immediate = true, name = "com.ibm.ws.security.authorization.jacc.ejb.service", configurationPolicy = ConfigurationPolicy.IGNORE, property = { "service.vendor=IBM" }) +@Component(service = EJBJaccService.class, name = "com.ibm.ws.security.authorization.jacc.ejb.service", configurationPolicy = ConfigurationPolicy.IGNORE, property = { "service.vendor=IBM" }) public class EJBJaccServiceImpl implements EJBJaccService { private static final String JACC_EJB_METHOD_ARGUMENT = "RequestMethodArgumentsRequired"; diff --git a/dev/com.ibm.ws.security.authorization.jacc.web/src/com/ibm/ws/security/authorization/jacc/web/impl/WebJaccServiceImpl.java b/dev/com.ibm.ws.security.authorization.jacc.web/src/com/ibm/ws/security/authorization/jacc/web/impl/WebJaccServiceImpl.java index 415afc0d6a52..2b7504519fb0 100644 --- a/dev/com.ibm.ws.security.authorization.jacc.web/src/com/ibm/ws/security/authorization/jacc/web/impl/WebJaccServiceImpl.java +++ b/dev/com.ibm.ws.security.authorization.jacc.web/src/com/ibm/ws/security/authorization/jacc/web/impl/WebJaccServiceImpl.java @@ -55,7 +55,7 @@ import com.ibm.wsspi.webcontainer.metadata.WebModuleMetaData; import com.ibm.wsspi.webcontainer.webapp.WebAppConfig; -@Component(service = WebJaccService.class, immediate = true, name = "com.ibm.ws.security.authorization.jacc.web.service", configurationPolicy = ConfigurationPolicy.IGNORE, property = { "service.vendor=IBM" }) +@Component(service = WebJaccService.class, name = "com.ibm.ws.security.authorization.jacc.web.service", configurationPolicy = ConfigurationPolicy.IGNORE, property = { "service.vendor=IBM" }) public class WebJaccServiceImpl implements WebJaccService { private static final TraceComponent tc = Tr.register(WebJaccServiceImpl.class);