#29535 include in 23.10.24 LTS

dotCMS · Oct 23, 2024 · 9e1c628 · 9e1c628
1 parent be57389
commit 9e1c628
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/dotCMS/hotfix_tracking.md b/dotCMS/hotfix_tracking.md
@@ -164,3 +164,4 @@ This maintenance release includes the following code fixes:
 157. https://github.com/dotCMS/core/issues/28855 : When page is locked, hover text still says "Lock Page" #28855
 158. https://github.com/dotCMS/core/issues/28735 : Locked page error text wrapping incorrectly #28735
 159. https://github.com/dotCMS/core/issues/30420 : Fix Test CircuitBreakerUrlTest.testGet and RemoteAnnouncementsLoaderIntegrationTest.TestAnnouncementsLoader #30420
+160. https://github.com/dotCMS/core/issues/29535 : Investigate and Resolve Session Already Invalidated Issue for PATCH API Call with Bearer Token #29535
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
@@ -1994,12 +1994,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();
@@ -2009,7 +2011,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) {