(tomcat) branch 8.5.x updated: Fix services sync

[remm]

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 f29b312704 Fix services sync
f29b312704 is described below

commit f29b3127049c1275d02ea0c1dab17b97dd912f5f
Author: remm <r...@apache.org>
AuthorDate: Tue Jan 16 16:13:47 2024 +0100

    Fix services sync
    
    Found by coverity.
---
 java/org/apache/catalina/core/StandardServer.java | 32 +++++++++++++++--------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/java/org/apache/catalina/core/StandardServer.java 
b/java/org/apache/catalina/core/StandardServer.java
index fa76dcb6a4..20af162d2c 100644
--- a/java/org/apache/catalina/core/StandardServer.java
+++ b/java/org/apache/catalina/core/StandardServer.java
@@ -572,18 +572,22 @@ public final class StandardServer extends 
LifecycleMBeanBase implements Server {
      */
     @Override
     public Service[] findServices() {
-        return services;
+        synchronized (servicesLock) {
+            return services.clone();
+        }
     }
 
     /**
      * @return the JMX service names.
      */
     public ObjectName[] getServiceNames() {
-        ObjectName[] onames = new ObjectName[services.length];
-        for (int i = 0; i < services.length; i++) {
-            onames[i] = ((StandardService) services[i]).getObjectName();
+        synchronized (servicesLock) {
+            ObjectName[] onames = new ObjectName[services.length];
+            for (int i = 0; i < services.length; i++) {
+                onames[i] = ((StandardService) services[i]).getObjectName();
+            }
+            return onames;
         }
-        return onames;
     }
 
 
@@ -792,8 +796,10 @@ public final class StandardServer extends 
LifecycleMBeanBase implements Server {
         fireLifecycleEvent(CONFIGURE_STOP_EVENT, null);
 
         // Stop our defined Services
-        for (Service service : services) {
-            service.stop();
+        synchronized (servicesLock) {
+            for (Service service : services) {
+                service.stop();
+            }
         }
 
         globalNamingResources.stop();
@@ -850,16 +856,20 @@ public final class StandardServer extends 
LifecycleMBeanBase implements Server {
             }
         }
         // Initialize our defined Services
-        for (Service service : services) {
-            service.init();
+        synchronized (servicesLock) {
+            for (Service service : services) {
+                service.init();
+            }
         }
     }
 
     @Override
     protected void destroyInternal() throws LifecycleException {
         // Destroy our defined Services
-        for (Service service : services) {
-            service.destroy();
+        synchronized (servicesLock) {
+            for (Service service : services) {
+                service.destroy();
+            }
         }
 
         globalNamingResources.destroy();


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org