This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit fbba611d8d42b9232a160d3e34659d713e98fc00
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Feb 1 16:53:59 2021 +0000
Allow Manager app to deploy applications in parallel
Seventh and final patch in a series of patches aimed at allowing
parallel requests to the Manager application to deploy different
applications in parallel rather than using a sync block to deploy them
serially.
The previous refactoring of the list of serviced applications now means
that it is safe for the Manage application to deploy applications in
parallel.
---
java/org/apache/catalina/manager/ManagerServlet.java | 6 ++----
webapps/docs/changelog.xml | 8 ++++++++
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/catalina/manager/ManagerServlet.java
b/java/org/apache/catalina/manager/ManagerServlet.java
index fe9f331..401fe0b 100644
--- a/java/org/apache/catalina/manager/ManagerServlet.java
+++ b/java/org/apache/catalina/manager/ManagerServlet.java
@@ -743,10 +743,8 @@ public class ManagerServlet extends HttpServlet implements
ContainerServlet {
* @param request Servlet request we are processing
* @param smClient i18n messages using the locale of the client
*/
- protected synchronized void deploy
- (PrintWriter writer, String config, ContextName cn,
- String tag, boolean update, HttpServletRequest request,
- StringManager smClient) {
+ protected void deploy(PrintWriter writer, String config, ContextName cn,
String tag, boolean update,
+ HttpServletRequest request, StringManager smClient) {
if (config != null && config.length() == 0) {
config = null;
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 919eaab..5327708 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -120,6 +120,14 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Web applications">
+ <changelog>
+ <fix>
+ Remove the restriction that prevented the Manager web application
+ deploying different web applications in parallel. (markt)
+ </fix>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 9.0.43 (markt)" rtext="2021-02-02">
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
