Skip to content

Commit 89b384e

Browse files
committed
Resolve coderabbitai review comments
1 parent 4d12146 commit 89b384e

1 file changed

Lines changed: 12 additions & 3 deletions

File tree

app/server/appsmith-server/src/main/java/com/appsmith/server/onload/internal/OnLoadExecutablesUtilCEImpl.java

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -294,9 +294,16 @@ public Mono<List<Set<DslExecutableDTO>>> findAllOnLoadExecutables(
294294
Mono<List<Executable>> flatPageLoadExecutablesMono = computeCompletePageLoadExecutableScheduleMono
295295
.then(executableNameToExecutableMapMono)
296296
.map(executableMap -> {
297-
onLoadExecutableSetRef.stream()
298-
.forEach(executableName ->
299-
flatPageLoadExecutablesRef.add(executableMap.get(executableName)));
297+
onLoadExecutableSetRef.stream().forEach(executableName -> {
298+
Executable executable = executableMap.get(executableName);
299+
if (executable != null) {
300+
flatPageLoadExecutablesRef.add(executable);
301+
} else {
302+
log.warn(
303+
"Executable with name `{}` not found in executable map when building flat page load executables list",
304+
executableName);
305+
}
306+
});
300307
return flatPageLoadExecutablesRef;
301308
});
302309

@@ -571,6 +578,8 @@ private Mono<List<Set<DslExecutableDTO>>> filterAndTransformSchedulingOrderToDTO
571578
name,
572579
names,
573580
executableMap.keySet());
581+
// Remove it from the onPageLoadExecutableSet to maintain consistency
582+
onPageLoadExecutableSet.remove(name);
574583
continue;
575584
}
576585
if (hasUserSetExecutableToNotRunOnPageLoad(executable)) {

0 commit comments

Comments
 (0)