bugfix: fixed leak by popping current context when application prep f…

…ails, or app is not run on current instance
payara · Dec 4, 2024 · 734fc05 · 734fc05
1 parent d2fbb5a
commit 734fc05
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/ApplicationLifecycle.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/ApplicationLifecycle.java
@@ -604,6 +604,7 @@ public void actOn(Logger logger) {
             if (report.getActionExitCode() != ActionReport.ExitCode.SUCCESS) {
                 context.postDeployClean(false /* not final clean-up yet */);
                 events.send(new Event<>(Deployment.DEPLOYMENT_FAILURE, context));
+                currentDeploymentContext.get().pop();
             }
         }
         ApplicationDeployment depl = new ApplicationDeployment(appInfo, context);
@@ -646,8 +647,8 @@ public void initialize(ApplicationInfo appInfo, Collection<? extends Sniffer> sn
                     events.send(new Event<>(Deployment.DEPLOYMENT_SUCCESS, appInfo));
                 }
             }
-            currentDeploymentContext.get().pop();
         }
+        currentDeploymentContext.get().pop();
     }
 
     @Override