This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 46ffe71676 Remove useless synchronized
46ffe71676 is described below
commit 46ffe71676e4d9ca689b5657a462b09dd10f9373
Author: remm <[email protected]>
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/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 ++--
26 files changed, 44 insertions(+), 44 deletions(-)
diff --git a/java/org/apache/catalina/authenticator/AuthenticatorBase.java
b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
index cecf8347e4..c63dedef53 100644
--- a/java/org/apache/catalina/authenticator/AuthenticatorBase.java
+++ b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
@@ -1196,7 +1196,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();
@@ -1233,7 +1233,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 9610cb9986..54e59d60c9 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 226312765e..ba2e11ca70 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 9d49fd8e1f..5b2b8eb5de 100644
--- a/java/org/apache/catalina/authenticator/SingleSignOn.java
+++ b/java/org/apache/catalina/authenticator/SingleSignOn.java
@@ -567,7 +567,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();
@@ -580,7 +580,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 6e4ef4b950..5e6f74d9a5 100644
--- a/java/org/apache/catalina/core/ContainerBase.java
+++ b/java/org/apache/catalina/core/ContainerBase.java
@@ -843,7 +843,7 @@ public abstract class ContainerBase extends
LifecycleMBeanBase implements Contai
* used
*/
@Override
- protected synchronized void startInternal() throws LifecycleException {
+ protected void startInternal() throws LifecycleException {
reconfigureStartStopExecutor(getStartStopThreads());
@@ -908,7 +908,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 02b35d196a..3a809a6af7 100644
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -4666,7 +4666,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());
@@ -5094,7 +5094,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 90a8094048..020bfa0a20 100644
--- a/java/org/apache/catalina/core/StandardEngine.java
+++ b/java/org/apache/catalina/core/StandardEngine.java
@@ -237,7 +237,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 24b488bec1..19a05778b1 100644
--- a/java/org/apache/catalina/core/StandardHost.java
+++ b/java/org/apache/catalina/core/StandardHost.java
@@ -767,7 +767,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 fda1847dee..c32dd68c1d 100644
--- a/java/org/apache/catalina/core/StandardWrapper.java
+++ b/java/org/apache/catalina/core/StandardWrapper.java
@@ -1499,7 +1499,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) {
@@ -1529,7 +1529,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 fdc152a459..d3a17633cf 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 47809b03bd..d85de34bd0 100644
--- a/java/org/apache/catalina/ha/session/DeltaManager.java
+++ b/java/org/apache/catalina/ha/session/DeltaManager.java
@@ -752,7 +752,7 @@ public class DeltaManager extends ClusterManagerBase {
* used
*/
@Override
- protected synchronized void startInternal() throws LifecycleException {
+ protected void startInternal() throws LifecycleException {
super.startInternal();
@@ -927,7 +927,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 28e1d5992d..562c2552f4 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 84a44b98ac..056b26ed5a 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 1b35d27ea8..1c6cbb73b3 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 0bf00c343f..2374207105 100644
--- a/java/org/apache/catalina/session/PersistentManagerBase.java
+++ b/java/org/apache/catalina/session/PersistentManagerBase.java
@@ -821,7 +821,7 @@ public abstract class PersistentManagerBase extends
ManagerBase implements Store
* used
*/
@Override
- protected synchronized void startInternal() throws LifecycleException {
+ protected void startInternal() throws LifecycleException {
super.startInternal();
@@ -843,7 +843,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 714bdd0e71..e4a6231dcf 100644
--- a/java/org/apache/catalina/session/StandardManager.java
+++ b/java/org/apache/catalina/session/StandardManager.java
@@ -337,7 +337,7 @@ public class StandardManager extends ManagerBase {
* used
*/
@Override
- protected synchronized void startInternal() throws LifecycleException {
+ protected void startInternal() throws LifecycleException {
super.startInternal();
@@ -361,7 +361,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/HealthCheckValve.java
b/java/org/apache/catalina/valves/HealthCheckValve.java
index b030e707af..7664c75ab3 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 07e7319bdb..57e7e75013 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 1110720581..8064e9b08b 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 6715533989..66b03d7868 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 d7a776f580..b2d5a5fa7a 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: [email protected]
For additional commands, e-mail: [email protected]
