This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 40fe1da Store config fixes
40fe1da is described below
commit 40fe1daf0c3c928f69b86ca8f9b05c4e9e0964e3
Author: remm <r...@apache.org>
AuthorDate: Fri Feb 7 16:09:20 2020 +0100
Store config fixes
The only real fix is the listener (no default constructor = boom).
---
java/org/apache/catalina/storeconfig/server-registry.xml | 4 +---
webapps/docs/changelog.xml | 7 +++++++
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/catalina/storeconfig/server-registry.xml
b/java/org/apache/catalina/storeconfig/server-registry.xml
index 97d0a45..846135d 100644
--- a/java/org/apache/catalina/storeconfig/server-registry.xml
+++ b/java/org/apache/catalina/storeconfig/server-registry.xml
@@ -99,9 +99,6 @@
children="true"
storeFactoryClass="org.apache.catalina.storeconfig.ConnectorSF"
storeAppenderClass="org.apache.catalina.storeconfig.ConnectorStoreAppender">
- <TransientAttribute>URIEncoding</TransientAttribute>
- <TransientAttribute>maxProcessor</TransientAttribute>
- <TransientAttribute>minProcessor</TransientAttribute>
<!-- All attribute duplicated from the SSLHostConfig, removed in
Tomcat 10 -->
<TransientAttribute>SSLProtocol</TransientAttribute>
<TransientAttribute>sslEnabledProtocols</TransientAttribute>
@@ -290,6 +287,7 @@
<TransientChild>org.apache.catalina.mbeans.ServerLifecycleListener</TransientChild>
<TransientChild>org.apache.catalina.core.NamingContextListener</TransientChild>
<TransientChild>org.apache.catalina.startup.ContextConfig</TransientChild>
+
<TransientChild>org.apache.catalina.startup.ContextConfig$HostWebXmlCacheCleaner</TransientChild>
<TransientChild>org.apache.catalina.startup.EngineConfig</TransientChild>
<TransientChild>org.apache.catalina.startup.HostConfig</TransientChild>
<TransientChild>org.apache.catalina.core.StandardHost$MemoryLeakTrackingListener</TransientChild>
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index c9dbc21..7974a2f 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -45,6 +45,13 @@
issues do not "pop up" wrt. others).
-->
<section name="Tomcat 8.5.52 (markt)" rtext="in development">
+ <subsection name="Catalina">
+ <changelog>
+ <fix>
+ Store config compatibility with HostWebXmlCacheCleaner listener. (remm)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="Jasper">
<changelog>
<scode>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
