This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push: new 54012bd3b8 Remove useless synchronized 54012bd3b8 is described below commit 54012bd3b860d95b7388b58ec9616fda35820eea Author: remm <r...@apache.org> AuthorDate: Thu Jan 18 16:34:43 2024 +0100 Remove useless synchronized Internal init, destroy, start and stop are always called by the final init, destroy, start and stop method of the lifecycle. These methods are synchronized. As a result, synchronized on these methods is useless. --- java/org/apache/catalina/authenticator/AuthenticatorBase.java | 4 ++-- java/org/apache/catalina/authenticator/DigestAuthenticator.java | 2 +- java/org/apache/catalina/authenticator/SSLAuthenticator.java | 2 +- java/org/apache/catalina/authenticator/SingleSignOn.java | 4 ++-- java/org/apache/catalina/core/ContainerBase.java | 4 ++-- java/org/apache/catalina/core/StandardContext.java | 4 ++-- java/org/apache/catalina/core/StandardEngine.java | 2 +- java/org/apache/catalina/core/StandardHost.java | 2 +- java/org/apache/catalina/core/StandardPipeline.java | 4 ++-- java/org/apache/catalina/core/StandardWrapper.java | 4 ++-- java/org/apache/catalina/ha/context/ReplicatedContext.java | 4 ++-- java/org/apache/catalina/ha/session/BackupManager.java | 4 ++-- java/org/apache/catalina/ha/session/DeltaManager.java | 4 ++-- java/org/apache/catalina/ha/session/JvmRouteBinderValve.java | 4 ++-- java/org/apache/catalina/ha/tcp/ReplicationValve.java | 2 +- java/org/apache/catalina/realm/LockOutRealm.java | 2 +- java/org/apache/catalina/session/PersistentManagerBase.java | 4 ++-- java/org/apache/catalina/session/StandardManager.java | 4 ++-- java/org/apache/catalina/session/StoreBase.java | 4 ++-- java/org/apache/catalina/valves/AccessLogValve.java | 4 ++-- java/org/apache/catalina/valves/FilterValve.java | 4 ++-- java/org/apache/catalina/valves/HealthCheckValve.java | 2 +- java/org/apache/catalina/valves/JDBCAccessLogValve.java | 4 ++-- java/org/apache/catalina/valves/RequestFilterValve.java | 2 +- java/org/apache/catalina/valves/SemaphoreValve.java | 4 ++-- java/org/apache/catalina/valves/ValveBase.java | 4 ++-- java/org/apache/catalina/valves/rewrite/RewriteValve.java | 4 ++-- 27 files changed, 46 insertions(+), 46 deletions(-) diff --git a/java/org/apache/catalina/authenticator/AuthenticatorBase.java b/java/org/apache/catalina/authenticator/AuthenticatorBase.java index 9a558d9c05..84856f1f38 100644 --- a/java/org/apache/catalina/authenticator/AuthenticatorBase.java +++ b/java/org/apache/catalina/authenticator/AuthenticatorBase.java @@ -1200,7 +1200,7 @@ public abstract class AuthenticatorBase extends ValveBase implements Authenticat @Override - protected synchronized void startInternal() throws LifecycleException { + protected void startInternal() throws LifecycleException { ServletContext servletContext = context.getServletContext(); jaspicAppContextID = servletContext.getVirtualServerName() + " " + servletContext.getContextPath(); @@ -1237,7 +1237,7 @@ public abstract class AuthenticatorBase extends ValveBase implements Authenticat @Override - protected synchronized void stopInternal() throws LifecycleException { + protected void stopInternal() throws LifecycleException { super.stopInternal(); sso = null; } diff --git a/java/org/apache/catalina/authenticator/DigestAuthenticator.java b/java/org/apache/catalina/authenticator/DigestAuthenticator.java index 399ffa8da4..a22c059abc 100644 --- a/java/org/apache/catalina/authenticator/DigestAuthenticator.java +++ b/java/org/apache/catalina/authenticator/DigestAuthenticator.java @@ -437,7 +437,7 @@ public class DigestAuthenticator extends AuthenticatorBase { // ------------------------------------------------------- Lifecycle Methods @Override - protected synchronized void startInternal() throws LifecycleException { + protected void startInternal() throws LifecycleException { super.startInternal(); // Generate a random secret key diff --git a/java/org/apache/catalina/authenticator/SSLAuthenticator.java b/java/org/apache/catalina/authenticator/SSLAuthenticator.java index 492fab8ba0..5b1c51910c 100644 --- a/java/org/apache/catalina/authenticator/SSLAuthenticator.java +++ b/java/org/apache/catalina/authenticator/SSLAuthenticator.java @@ -145,7 +145,7 @@ public class SSLAuthenticator extends AuthenticatorBase { @Override - protected synchronized void startInternal() throws LifecycleException { + protected void startInternal() throws LifecycleException { super.startInternal(); diff --git a/java/org/apache/catalina/authenticator/SingleSignOn.java b/java/org/apache/catalina/authenticator/SingleSignOn.java index c8f9d53c4a..78d97b967a 100644 --- a/java/org/apache/catalina/authenticator/SingleSignOn.java +++ b/java/org/apache/catalina/authenticator/SingleSignOn.java @@ -570,7 +570,7 @@ public class SingleSignOn extends ValveBase { @Override - protected synchronized void startInternal() throws LifecycleException { + protected void startInternal() throws LifecycleException { Container c = getContainer(); while (c != null && !(c instanceof Engine)) { c = c.getParent(); @@ -583,7 +583,7 @@ public class SingleSignOn extends ValveBase { @Override - protected synchronized void stopInternal() throws LifecycleException { + protected void stopInternal() throws LifecycleException { super.stopInternal(); engine = null; } diff --git a/java/org/apache/catalina/core/ContainerBase.java b/java/org/apache/catalina/core/ContainerBase.java index c3ab118646..0026a90c0e 100644 --- a/java/org/apache/catalina/core/ContainerBase.java +++ b/java/org/apache/catalina/core/ContainerBase.java @@ -810,7 +810,7 @@ public abstract class ContainerBase extends LifecycleMBeanBase implements Contai * used */ @Override - protected synchronized void startInternal() throws LifecycleException { + protected void startInternal() throws LifecycleException { reconfigureStartStopExecutor(getStartStopThreads()); @@ -875,7 +875,7 @@ public abstract class ContainerBase extends LifecycleMBeanBase implements Contai * used */ @Override - protected synchronized void stopInternal() throws LifecycleException { + protected void stopInternal() throws LifecycleException { // Stop our thread if (monitorFuture != null) { diff --git a/java/org/apache/catalina/core/StandardContext.java b/java/org/apache/catalina/core/StandardContext.java index b1cf52946d..ccd026d78a 100644 --- a/java/org/apache/catalina/core/StandardContext.java +++ b/java/org/apache/catalina/core/StandardContext.java @@ -4613,7 +4613,7 @@ public class StandardContext extends ContainerBase implements Context, Notificat * used */ @Override - protected synchronized void startInternal() throws LifecycleException { + protected void startInternal() throws LifecycleException { if (log.isDebugEnabled()) { log.debug("Starting " + getBaseName()); @@ -5024,7 +5024,7 @@ public class StandardContext extends ContainerBase implements Context, Notificat * used */ @Override - protected synchronized void stopInternal() throws LifecycleException { + protected void stopInternal() throws LifecycleException { // Send j2ee.state.stopping notification if (this.getObjectName() != null) { diff --git a/java/org/apache/catalina/core/StandardEngine.java b/java/org/apache/catalina/core/StandardEngine.java index ab7b7966da..59cc280fa3 100644 --- a/java/org/apache/catalina/core/StandardEngine.java +++ b/java/org/apache/catalina/core/StandardEngine.java @@ -229,7 +229,7 @@ public class StandardEngine extends ContainerBase implements Engine { * used */ @Override - protected synchronized void startInternal() throws LifecycleException { + protected void startInternal() throws LifecycleException { // Log our server identification information if (log.isInfoEnabled()) { diff --git a/java/org/apache/catalina/core/StandardHost.java b/java/org/apache/catalina/core/StandardHost.java index d704b0ccd2..2c901b3ff6 100644 --- a/java/org/apache/catalina/core/StandardHost.java +++ b/java/org/apache/catalina/core/StandardHost.java @@ -817,7 +817,7 @@ public class StandardHost extends ContainerBase implements Host { * used */ @Override - protected synchronized void startInternal() throws LifecycleException { + protected void startInternal() throws LifecycleException { // Set error report valve String errorValve = getErrorReportValveClass(); diff --git a/java/org/apache/catalina/core/StandardPipeline.java b/java/org/apache/catalina/core/StandardPipeline.java index b2c19fcf05..2158a198f1 100644 --- a/java/org/apache/catalina/core/StandardPipeline.java +++ b/java/org/apache/catalina/core/StandardPipeline.java @@ -159,7 +159,7 @@ public class StandardPipeline extends LifecycleBase implements Pipeline { * used */ @Override - protected synchronized void startInternal() throws LifecycleException { + protected void startInternal() throws LifecycleException { // Start the Valves in our pipeline (including the basic), if any Valve current = first; @@ -184,7 +184,7 @@ public class StandardPipeline extends LifecycleBase implements Pipeline { * used */ @Override - protected synchronized void stopInternal() throws LifecycleException { + protected void stopInternal() throws LifecycleException { setState(LifecycleState.STOPPING); diff --git a/java/org/apache/catalina/core/StandardWrapper.java b/java/org/apache/catalina/core/StandardWrapper.java index 82aeeda20b..d6b997620e 100644 --- a/java/org/apache/catalina/core/StandardWrapper.java +++ b/java/org/apache/catalina/core/StandardWrapper.java @@ -1280,7 +1280,7 @@ public class StandardWrapper extends ContainerBase implements ServletConfig, Wra * used */ @Override - protected synchronized void startInternal() throws LifecycleException { + protected void startInternal() throws LifecycleException { // Send j2ee.state.starting notification if (this.getObjectName() != null) { @@ -1310,7 +1310,7 @@ public class StandardWrapper extends ContainerBase implements ServletConfig, Wra * used */ @Override - protected synchronized void stopInternal() throws LifecycleException { + protected void stopInternal() throws LifecycleException { setAvailable(Long.MAX_VALUE); diff --git a/java/org/apache/catalina/ha/context/ReplicatedContext.java b/java/org/apache/catalina/ha/context/ReplicatedContext.java index da32d555c8..fbb06701d6 100644 --- a/java/org/apache/catalina/ha/context/ReplicatedContext.java +++ b/java/org/apache/catalina/ha/context/ReplicatedContext.java @@ -52,7 +52,7 @@ public class ReplicatedContext extends StandardContext implements MapOwner { * used */ @Override - protected synchronized void startInternal() throws LifecycleException { + protected void startInternal() throws LifecycleException { super.startInternal(); try { CatalinaCluster catclust = (CatalinaCluster) this.getCluster(); @@ -76,7 +76,7 @@ public class ReplicatedContext extends StandardContext implements MapOwner { * used */ @Override - protected synchronized void stopInternal() throws LifecycleException { + protected void stopInternal() throws LifecycleException { Map<String,Object> map = ((ReplApplContext) this.context).getAttributeMap(); diff --git a/java/org/apache/catalina/ha/session/BackupManager.java b/java/org/apache/catalina/ha/session/BackupManager.java index 9be442736a..095fbc9c4c 100644 --- a/java/org/apache/catalina/ha/session/BackupManager.java +++ b/java/org/apache/catalina/ha/session/BackupManager.java @@ -132,7 +132,7 @@ public class BackupManager extends ClusterManagerBase implements MapOwner, Distr * used */ @Override - protected synchronized void startInternal() throws LifecycleException { + protected void startInternal() throws LifecycleException { super.startInternal(); @@ -170,7 +170,7 @@ public class BackupManager extends ClusterManagerBase implements MapOwner, Distr * used */ @Override - protected synchronized void stopInternal() throws LifecycleException { + protected void stopInternal() throws LifecycleException { if (log.isDebugEnabled()) { log.debug(sm.getString("backupManager.stopped", getName())); diff --git a/java/org/apache/catalina/ha/session/DeltaManager.java b/java/org/apache/catalina/ha/session/DeltaManager.java index 2a1db478a7..3c0025022c 100644 --- a/java/org/apache/catalina/ha/session/DeltaManager.java +++ b/java/org/apache/catalina/ha/session/DeltaManager.java @@ -633,7 +633,7 @@ public class DeltaManager extends ClusterManagerBase { * used */ @Override - protected synchronized void startInternal() throws LifecycleException { + protected void startInternal() throws LifecycleException { super.startInternal(); @@ -808,7 +808,7 @@ public class DeltaManager extends ClusterManagerBase { * used */ @Override - protected synchronized void stopInternal() throws LifecycleException { + protected void stopInternal() throws LifecycleException { if (log.isDebugEnabled()) { log.debug(sm.getString("deltaManager.stopped", getName())); diff --git a/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java b/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java index a5e5955d30..69242b392b 100644 --- a/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java +++ b/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java @@ -355,7 +355,7 @@ public class JvmRouteBinderValve extends ValveBase implements ClusterValve { * used */ @Override - protected synchronized void startInternal() throws LifecycleException { + protected void startInternal() throws LifecycleException { if (cluster == null) { Cluster containerCluster = getContainer().getCluster(); @@ -383,7 +383,7 @@ public class JvmRouteBinderValve extends ValveBase implements ClusterValve { * used */ @Override - protected synchronized void stopInternal() throws LifecycleException { + protected void stopInternal() throws LifecycleException { super.stopInternal(); diff --git a/java/org/apache/catalina/ha/tcp/ReplicationValve.java b/java/org/apache/catalina/ha/tcp/ReplicationValve.java index 1ce063c81b..168b550bef 100644 --- a/java/org/apache/catalina/ha/tcp/ReplicationValve.java +++ b/java/org/apache/catalina/ha/tcp/ReplicationValve.java @@ -363,7 +363,7 @@ public class ReplicationValve extends ValveBase implements ClusterValve { * used */ @Override - protected synchronized void startInternal() throws LifecycleException { + protected void startInternal() throws LifecycleException { if (cluster == null) { Cluster containerCluster = getContainer().getCluster(); if (containerCluster instanceof CatalinaCluster) { diff --git a/java/org/apache/catalina/realm/LockOutRealm.java b/java/org/apache/catalina/realm/LockOutRealm.java index dba91ccd22..5c74c64150 100644 --- a/java/org/apache/catalina/realm/LockOutRealm.java +++ b/java/org/apache/catalina/realm/LockOutRealm.java @@ -73,7 +73,7 @@ public class LockOutRealm extends CombinedRealm { @Override - protected synchronized void startInternal() throws LifecycleException { + protected void startInternal() throws LifecycleException { /* * Configure the list of failed users to delete the oldest entry once it exceeds the specified size. This is an * LRU cache so if the cache size is exceeded the users who most recently failed authentication will be diff --git a/java/org/apache/catalina/session/PersistentManagerBase.java b/java/org/apache/catalina/session/PersistentManagerBase.java index 79536c9da0..e73723383e 100644 --- a/java/org/apache/catalina/session/PersistentManagerBase.java +++ b/java/org/apache/catalina/session/PersistentManagerBase.java @@ -690,7 +690,7 @@ public abstract class PersistentManagerBase extends ManagerBase implements Store * used */ @Override - protected synchronized void startInternal() throws LifecycleException { + protected void startInternal() throws LifecycleException { super.startInternal(); @@ -712,7 +712,7 @@ public abstract class PersistentManagerBase extends ManagerBase implements Store * used */ @Override - protected synchronized void stopInternal() throws LifecycleException { + protected void stopInternal() throws LifecycleException { if (log.isDebugEnabled()) { log.debug("Stopping"); diff --git a/java/org/apache/catalina/session/StandardManager.java b/java/org/apache/catalina/session/StandardManager.java index 72f5159f78..b0f2764121 100644 --- a/java/org/apache/catalina/session/StandardManager.java +++ b/java/org/apache/catalina/session/StandardManager.java @@ -249,7 +249,7 @@ public class StandardManager extends ManagerBase { * used */ @Override - protected synchronized void startInternal() throws LifecycleException { + protected void startInternal() throws LifecycleException { super.startInternal(); @@ -273,7 +273,7 @@ public class StandardManager extends ManagerBase { * used */ @Override - protected synchronized void stopInternal() throws LifecycleException { + protected void stopInternal() throws LifecycleException { if (log.isDebugEnabled()) { log.debug("Stopping"); diff --git a/java/org/apache/catalina/session/StoreBase.java b/java/org/apache/catalina/session/StoreBase.java index 222864a6d6..60d717e1ba 100644 --- a/java/org/apache/catalina/session/StoreBase.java +++ b/java/org/apache/catalina/session/StoreBase.java @@ -241,7 +241,7 @@ public abstract class StoreBase extends LifecycleBase implements Store { * used */ @Override - protected synchronized void startInternal() throws LifecycleException { + protected void startInternal() throws LifecycleException { setState(LifecycleState.STARTING); } @@ -254,7 +254,7 @@ public abstract class StoreBase extends LifecycleBase implements Store { * used */ @Override - protected synchronized void stopInternal() throws LifecycleException { + protected void stopInternal() throws LifecycleException { setState(LifecycleState.STOPPING); } diff --git a/java/org/apache/catalina/valves/AccessLogValve.java b/java/org/apache/catalina/valves/AccessLogValve.java index 3acfaaf5f5..63d3527a22 100644 --- a/java/org/apache/catalina/valves/AccessLogValve.java +++ b/java/org/apache/catalina/valves/AccessLogValve.java @@ -650,7 +650,7 @@ public class AccessLogValve extends AbstractAccessLogValve { * used */ @Override - protected synchronized void startInternal() throws LifecycleException { + protected void startInternal() throws LifecycleException { // Initialize the Date formatters String format = getFileDateFormat(); @@ -674,7 +674,7 @@ public class AccessLogValve extends AbstractAccessLogValve { * used */ @Override - protected synchronized void stopInternal() throws LifecycleException { + protected void stopInternal() throws LifecycleException { super.stopInternal(); close(false); diff --git a/java/org/apache/catalina/valves/FilterValve.java b/java/org/apache/catalina/valves/FilterValve.java index 2f47845322..4405106d31 100644 --- a/java/org/apache/catalina/valves/FilterValve.java +++ b/java/org/apache/catalina/valves/FilterValve.java @@ -180,7 +180,7 @@ public class FilterValve extends ValveBase implements FilterConfig { } @Override - protected synchronized void startInternal() throws LifecycleException { + protected void startInternal() throws LifecycleException { super.startInternal(); if (null == getFilterClassName()) { @@ -220,7 +220,7 @@ public class FilterValve extends ValveBase implements FilterConfig { } @Override - protected synchronized void stopInternal() throws LifecycleException { + protected void stopInternal() throws LifecycleException { super.stopInternal(); if (null != filter) { diff --git a/java/org/apache/catalina/valves/HealthCheckValve.java b/java/org/apache/catalina/valves/HealthCheckValve.java index dbc9c3bbe8..d411f82626 100644 --- a/java/org/apache/catalina/valves/HealthCheckValve.java +++ b/java/org/apache/catalina/valves/HealthCheckValve.java @@ -72,7 +72,7 @@ public class HealthCheckValve extends ValveBase { } @Override - protected synchronized void startInternal() throws LifecycleException { + protected void startInternal() throws LifecycleException { super.startInternal(); context = (getContainer() instanceof Context); } diff --git a/java/org/apache/catalina/valves/JDBCAccessLogValve.java b/java/org/apache/catalina/valves/JDBCAccessLogValve.java index ff9dcb4ff3..c93874ad17 100644 --- a/java/org/apache/catalina/valves/JDBCAccessLogValve.java +++ b/java/org/apache/catalina/valves/JDBCAccessLogValve.java @@ -622,7 +622,7 @@ public final class JDBCAccessLogValve extends ValveBase implements AccessLog { * used */ @Override - protected synchronized void startInternal() throws LifecycleException { + protected void startInternal() throws LifecycleException { try { open(); } catch (SQLException e) { @@ -640,7 +640,7 @@ public final class JDBCAccessLogValve extends ValveBase implements AccessLog { * used */ @Override - protected synchronized void stopInternal() throws LifecycleException { + protected void stopInternal() throws LifecycleException { super.stopInternal(); close(); } diff --git a/java/org/apache/catalina/valves/RequestFilterValve.java b/java/org/apache/catalina/valves/RequestFilterValve.java index 5766de0d50..b42f83334c 100644 --- a/java/org/apache/catalina/valves/RequestFilterValve.java +++ b/java/org/apache/catalina/valves/RequestFilterValve.java @@ -331,7 +331,7 @@ public abstract class RequestFilterValve extends ValveBase { @Override - protected synchronized void startInternal() throws LifecycleException { + protected void startInternal() throws LifecycleException { if (!allowValid || !denyValid) { throw new LifecycleException(sm.getString("requestFilterValve.configInvalid")); } diff --git a/java/org/apache/catalina/valves/SemaphoreValve.java b/java/org/apache/catalina/valves/SemaphoreValve.java index 34e0a54053..9a4edfd61e 100644 --- a/java/org/apache/catalina/valves/SemaphoreValve.java +++ b/java/org/apache/catalina/valves/SemaphoreValve.java @@ -121,7 +121,7 @@ public class SemaphoreValve extends ValveBase { * used */ @Override - protected synchronized void startInternal() throws LifecycleException { + protected void startInternal() throws LifecycleException { semaphore = new Semaphore(concurrency, fairness); super.startInternal(); } @@ -135,7 +135,7 @@ public class SemaphoreValve extends ValveBase { * used */ @Override - protected synchronized void stopInternal() throws LifecycleException { + protected void stopInternal() throws LifecycleException { super.stopInternal(); semaphore = null; } diff --git a/java/org/apache/catalina/valves/ValveBase.java b/java/org/apache/catalina/valves/ValveBase.java index 55fb57cadb..8d69925229 100644 --- a/java/org/apache/catalina/valves/ValveBase.java +++ b/java/org/apache/catalina/valves/ValveBase.java @@ -142,7 +142,7 @@ public abstract class ValveBase extends LifecycleMBeanBase implements Contained, * used */ @Override - protected synchronized void startInternal() throws LifecycleException { + protected void startInternal() throws LifecycleException { setState(LifecycleState.STARTING); } @@ -155,7 +155,7 @@ public abstract class ValveBase extends LifecycleMBeanBase implements Contained, * used */ @Override - protected synchronized void stopInternal() throws LifecycleException { + protected void stopInternal() throws LifecycleException { setState(LifecycleState.STOPPING); } diff --git a/java/org/apache/catalina/valves/rewrite/RewriteValve.java b/java/org/apache/catalina/valves/rewrite/RewriteValve.java index b7a617162e..61abc09e18 100644 --- a/java/org/apache/catalina/valves/rewrite/RewriteValve.java +++ b/java/org/apache/catalina/valves/rewrite/RewriteValve.java @@ -133,7 +133,7 @@ public class RewriteValve extends ValveBase { @Override - protected synchronized void startInternal() throws LifecycleException { + protected void startInternal() throws LifecycleException { super.startInternal(); @@ -269,7 +269,7 @@ public class RewriteValve extends ValveBase { } @Override - protected synchronized void stopInternal() throws LifecycleException { + protected void stopInternal() throws LifecycleException { super.stopInternal(); for (RewriteMap map : maps.values()) { if (map instanceof Lifecycle) { --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org