#29535 include in 23.01.24 LTS

dotCMS · Sep 26, 2024 · ba80916 · ba80916
1 parent f32503f
commit ba80916
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/dotCMS/src/main/java/com/dotcms/rest/api/v1/workflow/WorkflowResource.java b/dotCMS/src/main/java/com/dotcms/rest/api/v1/workflow/WorkflowResource.java
@@ -1988,12 +1988,14 @@ private void mergeContentletsByDefaultAction(final List<SingleContentQuery> cont
                 new DotConcurrentFactory.SubmitterConfigBuilder().poolSize(2).maxPoolSize(5).queueCapacity(CONTENTLETS_LIMIT).build());
         final CompletionService<Map<String, Object>> completionService = new ExecutorCompletionService<>(dotSubmitter);
         final List<Future<Map<String, Object>>> futures = new ArrayList<>();
+        final HttpServletRequest statelessRequest = RequestUtil.INSTANCE.createStatelessRequest(request);
 
         for (final SingleContentQuery singleContentQuery : contentletsToMergeList) {
 
             // this triggers the merges
             final Future<Map<String, Object>> future = completionService.submit(() -> {
 
+                HttpServletRequestThreadLocal.INSTANCE.setRequest(statelessRequest);
                 final Map<String, Object> resultMap = new HashMap<>();
                 final String inode      = singleContentQuery.getInode();
                 final String identifier = singleContentQuery.getIdentifier();
@@ -2003,7 +2005,7 @@ private void mergeContentletsByDefaultAction(final List<SingleContentQuery> cont
 
                 try {
 
-                    fireTransactionalAction(systemAction, fireActionForm, request, mode,
+                    fireTransactionalAction(systemAction, fireActionForm, statelessRequest, mode,
                             initDataObject, resultMap, inode, identifier, languageId, user, indexPolicy);
                 } catch (Exception e) {