fixed bug in legacy ejb-jar scenario

payara · Nov 21, 2024 · 61c4079 · 61c4079
1 parent a283717
commit 61c4079
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/appserver/web/weld-integration/src/main/java/org/glassfish/weld/WeldDeployer.java b/appserver/web/weld-integration/src/main/java/org/glassfish/weld/WeldDeployer.java
@@ -462,11 +462,11 @@ private WeldBootstrap ensureWeldBootstrapCreated(DeploymentContext context, Appl
         return bootstrap;
     }
 
-    private void registerServices(DeploymentImpl deploymentImpl) {
+    private void registerServices(DeploymentImpl deploymentImpl, RootBeanDeploymentArchive rootBDA) {
         for (var entry : bundleToBeanDeploymentArchive.entrySet()) {
             if (deploymentImpl.getBeanDeploymentArchives().contains(entry.getValue())) {
                 var bundle = entry.getKey();
-                var beanDeploymentArchive = deploymentImpl.getRootBDAs().iterator().next().moduleBda;
+                var beanDeploymentArchive = rootBDA == null ? entry.getValue() : rootBDA.moduleBda;
 
                 if (!beanDeploymentArchive.getBeansXml().getBeanDiscoveryMode().equals(NONE)) {
 
@@ -526,7 +526,7 @@ private void processApplicationLoaded(ApplicationInfo applicationInfo) {
                     DeploymentImpl.currentDeploymentContext.set(rootBDA.context);
                     try {
                         DeploymentImpl filtered = deploymentImpl.filter(rootBDA, applicationInfo);
-                        completeDeployment(filtered);
+                        completeDeployment(filtered, filtered.getRootBDAs().iterator().next());
                         WeldBootstrap bootstrap = filtered.context.getTransientAppMetaData(WELD_BOOTSTRAP, WeldBootstrap.class);
                         startWeldBootstrap(applicationInfo, rootBDA, bootstrap, filtered, componentInvocation);
                     } finally {
@@ -536,7 +536,7 @@ private void processApplicationLoaded(ApplicationInfo applicationInfo) {
                     }
                 }
             } else if (!deploymentImpl.getRootBDAs().isEmpty()) {
-                completeDeployment(deploymentImpl);
+                completeDeployment(deploymentImpl, null);
                 // Legacy EJB-Jar scenario, one Weld instance per EAR
                 RootBeanDeploymentArchive bda = deploymentImpl.getRootBDAs().iterator().next();
                 WeldBootstrap bootstrap = unifyBootstrap(bda, applicationInfo);
@@ -563,8 +563,8 @@ private void processApplicationLoaded(ApplicationInfo applicationInfo) {
         }
     }
 
-    private void completeDeployment(DeploymentImpl deploymentImpl) {
-        registerServices(deploymentImpl);
+    private void completeDeployment(DeploymentImpl deploymentImpl, RootBeanDeploymentArchive rootBDA) {
+        registerServices(deploymentImpl, rootBDA);
         deploymentImpl.buildDeploymentGraph();
 
         Set<BeanDeploymentArchive> archives = deploymentImpl.getBeanDeploymentArchives();