You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2023/11/24 18:14:50 UTC
(tomcat) branch 10.1.x updated (97c1d3f461 -> 385cf3a6b2)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
from 97c1d3f461 Version bump
new a008e060ae Remove unnecessary code
new 385cf3a6b2 Fix warnings / widen background process / lifecycle fix
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
java/org/apache/catalina/core/StandardContext.java | 2 +-
java/org/apache/catalina/core/StandardWrapper.java | 2 +-
java/org/apache/catalina/startup/HostConfig.java | 6 ++----
3 files changed, 4 insertions(+), 6 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
(tomcat) 01/02: Remove unnecessary code
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit a008e060ae308f42c6d1a71c985d38a7ee8b45b5
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Nov 24 17:07:45 2023 +0000
Remove unnecessary code
---
java/org/apache/catalina/startup/HostConfig.java | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/catalina/startup/HostConfig.java b/java/org/apache/catalina/startup/HostConfig.java
index fecfb3fc49..43b8d46b25 100644
--- a/java/org/apache/catalina/startup/HostConfig.java
+++ b/java/org/apache/catalina/startup/HostConfig.java
@@ -1725,10 +1725,8 @@ public class HostConfig implements LifecycleListener {
*/
public void check(String name) {
synchronized (host) {
- if (host instanceof Lifecycle) {
- if (!((Lifecycle) host).getState().isAvailable()) {
- return;
- }
+ if (!((Lifecycle) host).getState().isAvailable()) {
+ return;
}
if (tryAddServiced(name)) {
try {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
(tomcat) 02/02: Fix warnings / widen background process / lifecycle fix
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 385cf3a6b26cea3a510924d9a96f93b4cd9b16b8
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Nov 24 17:15:16 2023 +0000
Fix warnings / widen background process / lifecycle fix
---
java/org/apache/catalina/core/StandardContext.java | 2 +-
java/org/apache/catalina/core/StandardWrapper.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/core/StandardContext.java b/java/org/apache/catalina/core/StandardContext.java
index fddaf9c8ed..e4a701872b 100644
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -5210,7 +5210,7 @@ public class StandardContext extends ContainerBase implements Context, Notificat
@Override
- public void backgroundProcess() {
+ public synchronized void backgroundProcess() {
if (!getState().isAvailable()) {
return;
diff --git a/java/org/apache/catalina/core/StandardWrapper.java b/java/org/apache/catalina/core/StandardWrapper.java
index ec9022a0d7..66ad053e1a 100644
--- a/java/org/apache/catalina/core/StandardWrapper.java
+++ b/java/org/apache/catalina/core/StandardWrapper.java
@@ -512,7 +512,7 @@ public class StandardWrapper extends ContainerBase implements ServletConfig, Wra
* this container. Unexpected throwables will be caught and logged.
*/
@Override
- public void backgroundProcess() {
+ public synchronized void backgroundProcess() {
super.backgroundProcess();
if (!getState().isAvailable()) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org