[wicket] branch wicket-8.x updated: WICKET-6965 Memory leak in WicketEndpoint (#505)

[mgrigorov]

This is an automated email from the ASF dual-hosted git repository.

mgrigorov pushed a commit to branch wicket-8.x
in repository https://gitbox.apache.org/repos/asf/wicket.git


The following commit(s) were added to refs/heads/wicket-8.x by this push:
     new 09543c7  WICKET-6965 Memory leak in WicketEndpoint (#505)
09543c7 is described below

commit 09543c71a666daae519503310b8f431e515312ee
Author: Martin Grigorov <marti...@users.noreply.github.com>
AuthorDate: Wed Mar 23 13:46:24 2022 +0200

    WICKET-6965 Memory leak in WicketEndpoint (#505)
    
    * WICKET-6965 Memory leak in WicketEndpoint
    
    Make WicketEndpoint#REGISTERED_LISTENERS a static field.
    Unregister the listener at Application#onBeforeDestroyed()
    
    Signed-off-by: Martin Tzvetanov Grigorov <mgrigo...@apache.org>
    
    * WICKET-6965 Memory leak in WicketEndpoint
    
    Drop the usage of AtomicBoolean to track whether an application is
    running or not. Use the same set for 'registered listeners' and `alive
    applications'
    
    Signed-off-by: Martin Tzvetanov Grigorov <mgrigo...@apache.org>
    (cherry picked from commit e63ed88ef6ba5335194d0839f4cd6f0e1fbba791)
---
 .../wicket/protocol/ws/javax/WicketEndpoint.java   | 35 +++++++++++-----------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git 
a/wicket-native-websocket/wicket-native-websocket-javax/src/main/java/org/apache/wicket/protocol/ws/javax/WicketEndpoint.java
 
b/wicket-native-websocket/wicket-native-websocket-javax/src/main/java/org/apache/wicket/protocol/ws/javax/WicketEndpoint.java
index 90bdb51..cf9c6de 100644
--- 
a/wicket-native-websocket/wicket-native-websocket-javax/src/main/java/org/apache/wicket/protocol/ws/javax/WicketEndpoint.java
+++ 
b/wicket-native-websocket/wicket-native-websocket-javax/src/main/java/org/apache/wicket/protocol/ws/javax/WicketEndpoint.java
@@ -22,7 +22,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicBoolean;
 
 import javax.websocket.CloseReason;
 import javax.websocket.Endpoint;
@@ -46,13 +45,15 @@ public class WicketEndpoint extends Endpoint
        private static final Logger LOG = 
LoggerFactory.getLogger(WicketEndpoint.class);
 
        /**
+        * A set of started applications for which this endpoint is registered.
+        */
+       private static final Set<String> RUNNING_APPLICATIONS = 
ConcurrentHashMap.newKeySet();
+
+       /**
         * The name of the request parameter that holds the application name
         */
        private static final String WICKET_APP_PARAM_NAME = "wicket-app-name";
 
-       private final AtomicBoolean applicationDestroyed = new 
AtomicBoolean(false);
-       private final Set<String> registeredListeners = 
ConcurrentHashMap.newKeySet();
-
        private JavaxWebSocketProcessor javaxWebSocketProcessor;
 
        @Override
@@ -61,9 +62,9 @@ public class WicketEndpoint extends Endpoint
                String appName = getApplicationName(session);
 
                WebApplication app = (WebApplication) 
WebApplication.get(appName);
-               if (registeredListeners.add(appName))
+               if (RUNNING_APPLICATIONS.add(appName))
                {
-                       app.getApplicationListeners().add(new 
ApplicationListener(applicationDestroyed));
+                       app.getApplicationListeners().add(new 
ApplicationListener());
                }
 
                try
@@ -88,7 +89,8 @@ public class WicketEndpoint extends Endpoint
                LOG.debug("Web Socket connection with id '{}' has been closed 
with code '{}' and reason: {}",
                                session.getId(), closeCode, reasonPhrase);
 
-               if (isApplicationAlive() && javaxWebSocketProcessor != null)
+               String applicationName = getApplicationName(session);
+               if (isApplicationAlive(applicationName) && 
javaxWebSocketProcessor != null)
                {
                        javaxWebSocketProcessor.onClose(closeCode, 
reasonPhrase);
                }
@@ -108,7 +110,8 @@ public class WicketEndpoint extends Endpoint
 
                super.onError(session, t);
 
-               if (isApplicationAlive() && javaxWebSocketProcessor != null)
+               String applicationName = getApplicationName(session);
+               if (isApplicationAlive(applicationName) && 
javaxWebSocketProcessor != null)
                {
                        javaxWebSocketProcessor.onError(t);
                }
@@ -121,8 +124,9 @@ public class WicketEndpoint extends Endpoint
                    (t instanceof IOException && "Broken 
pipe".equals(t.getMessage()));
        }
 
-       private boolean isApplicationAlive() {
-               return applicationDestroyed.get() == false;
+       private boolean isApplicationAlive(String appName)
+       {
+               return RUNNING_APPLICATIONS.contains(appName);
        }
 
        private String getApplicationName(Session session)
@@ -160,17 +164,12 @@ public class WicketEndpoint extends Endpoint
 
        private static class ApplicationListener implements IApplicationListener
        {
-               private final AtomicBoolean applicationDestroyed;
-
-               private ApplicationListener(AtomicBoolean applicationDestroyed)
-               {
-                       this.applicationDestroyed = applicationDestroyed;
-               }
-
                @Override
                public void onBeforeDestroyed(Application application)
                {
-                       applicationDestroyed.set(true);
+                       String appName = application.getName();
+                       RUNNING_APPLICATIONS.remove(appName);
+                       application.getApplicationListeners().remove(this);
                }
        }
 }