From 7d8fca9545b6e5f8cabbeb5eb866e9c2745f21e4 Mon Sep 17 00:00:00 2001
From: Vishnu Gp <vishnu@appsmith.com>
Date: Sat, 30 Jul 2022 00:34:23 +0530
Subject: [PATCH] chore: Fixed flaky ApplicationForkingServiceTests (#15550)

---
 .../server/services/ce/ApplicationPageServiceCEImpl.java  | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationPageServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationPageServiceCEImpl.java
index 777a649add..f7689c08f2 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationPageServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationPageServiceCEImpl.java
@@ -999,12 +999,8 @@ public class ApplicationPageServiceCEImpl implements ApplicationPageServiceCE {
                 .flatMap(actionCollectionService::save)
                 .collectList();
 
-        return Mono.when(
-                        publishApplicationAndPages,
-                        publishedActionsListMono,
-                        publishedActionCollectionsListMono,
-                        publishThemeMono
-                )
+        return publishApplicationAndPages
+                .flatMap(newPages -> Mono.zip(publishedActionsListMono, publishedActionCollectionsListMono, publishThemeMono))
                 .then(sendApplicationPublishedEvent(publishApplicationAndPages, publishedActionsListMono, publishedActionCollectionsListMono, applicationId, isPublishedManually));
     }