Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue 29535 wf merge session fix #29693

Merged
merged 26 commits into from
Aug 26, 2024
Merged
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
cf827da
Revert "fix: #28563 removing template ajax (#28572)"
jdotcms May 15, 2024
fb39637
Merge branch 'master' of github.com:dotCMS/core
jdotcms Jun 11, 2024
af6fed1
Merge branch 'master' of github.com:dotCMS/core
jdotcms Jun 14, 2024
96dd743
Merge branch 'master' of github.com:dotCMS/core
jdotcms Jun 18, 2024
fb71cf9
Merge branch 'master' of github.com:dotCMS/core
jdotcms Jun 24, 2024
ae1d5e1
Merge branches 'master' and 'master' of github.com:dotCMS/core
jdotcms Jun 25, 2024
b523af6
Merge branch 'master' of github.com:dotCMS/core
jdotcms Jun 27, 2024
95de159
Merge branch 'master' of github.com:dotCMS/core
jdotcms Jun 27, 2024
679b600
Merge branch 'master' of github.com:dotCMS/core
jdotcms Jun 28, 2024
4bb207b
Merge branch 'master' of github.com:dotCMS/core
jdotcms Jul 2, 2024
320b4b1
Merge branches 'master' and 'master' of github.com:dotCMS/core
jdotcms Jul 2, 2024
ed6a751
Merge branches 'master' and 'master' of github.com:dotCMS/core
jdotcms Jul 3, 2024
02a6e96
Merge branch 'master' of github.com:dotCMS/core
jdotcms Jul 4, 2024
5479786
Merge branch 'master' of github.com:dotCMS/core
jdotcms Jul 5, 2024
0762192
Merge branch 'master' of github.com:dotCMS/core
jdotcms Jul 9, 2024
2a61c7f
Merge branch 'master' of github.com:dotCMS/core
jdotcms Jul 11, 2024
0afad59
Merge branch 'master' of github.com:dotCMS/core
jdotcms Jul 17, 2024
9c510e7
Merge branch 'master' of github.com:dotCMS/core
jdotcms Jul 18, 2024
24a5827
Merge branch 'master' of github.com:dotCMS/core
jdotcms Jul 19, 2024
7468cd7
Merge branch 'master' of github.com:dotCMS/core
jdotcms Jul 22, 2024
0388022
Merge branch 'master' of github.com:dotCMS/core
jdotcms Jul 29, 2024
162ade1
Merge branch 'master' of github.com:dotCMS/core
jdotcms Aug 19, 2024
1e9be41
Merge branch 'master' of github.com:dotCMS/core
jdotcms Aug 21, 2024
17cac16
Merge branch 'master' of github.com:dotCMS/core
jdotcms Aug 21, 2024
0903ac2
#29535 now the request is mock
jdotcms Aug 21, 2024
45af7ae
#29535 now the request is mock
jdotcms Aug 21, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -2537,12 +2537,16 @@ 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<>();
// todo: add the mock request
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();
Expand All @@ -2552,7 +2556,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) {

Expand Down