From cd8ad11d075b9aab56bb7356617662f5350048ec Mon Sep 17 00:00:00 2001
From: Nidhi <nidhi@appsmith.com>
Date: Tue, 30 Apr 2024 04:44:35 +0530
Subject: [PATCH] fix: Empty plugin ids in workspaces are breaking application
 load (#33042)

---
 .../com/appsmith/server/plugins/base/PluginServiceCEImpl.java   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/plugins/base/PluginServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/plugins/base/PluginServiceCEImpl.java
index f14b49432d..4918834a3b 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/plugins/base/PluginServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/plugins/base/PluginServiceCEImpl.java
@@ -51,6 +51,7 @@ import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -118,6 +119,7 @@ public class PluginServiceCEImpl extends BaseService<PluginRepository, Plugin, S
 
                     Set<String> pluginIds = workspace.getPlugins().stream()
                             .map(WorkspacePlugin::getPluginId)
+                            .filter(Objects::nonNull)
                             .collect(Collectors.toUnmodifiableSet());
 
                     return repository.findAllById(pluginIds);