This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 365f39e9f43c818879a555070cfab52d8b4cebbb
Merge: babbd5efd 1a3af1907
Author: Lukasz Lenart <lukaszlen...@apache.org>
AuthorDate: Thu Mar 30 19:26:29 2023 +0200
Merge pull request #673 from apache/WW-5289-executor
[WW-5289] Fixes creating executor to avoid locking JVM on shutdown
apps/showcase/src/main/resources/struts-wait.xml | 5 ++++-
.../xwork2/config/providers/StrutsDefaultConfigurationProvider.java | 4 ++++
core/src/main/java/org/apache/struts2/StrutsConstants.java | 3 +++
.../java/org/apache/struts2/config/StrutsBeanSelectionProvider.java | 3 +++
.../org/apache/struts2/interceptor/ExecuteAndWaitInterceptor.java | 5 +++--
.../org/apache/struts2/interceptor/exec/StrutsExecutorProvider.java | 2 +-
core/src/main/resources/struts-beans.xml | 3 +++
7 files changed, 21 insertions(+), 4 deletions(-)
