You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ta...@apache.org on 2025/08/21 09:01:03 UTC
(myfaces) branch 4.1.x updated: MYFACES-4660 4.1 view destroying fix + keeping track of user connection in multiple tabs (#705)
This is an automated email from the ASF dual-hosted git repository.
tandraschko pushed a commit to branch 4.1.x
in repository https://gitbox.apache.org/repos/asf/myfaces.git
The following commit(s) were added to refs/heads/4.1.x by this push:
new 5a182fc02 MYFACES-4660 4.1 view destroying fix + keeping track of user connection in multiple tabs (#705)
5a182fc02 is described below
commit 5a182fc02a2ae94ec5a0c302f7ce5dc80b5f50b1
Author: Milan Siebenbürger <mi...@gmail.com>
AuthorDate: Thu Aug 21 11:00:57 2025 +0200
MYFACES-4660 4.1 view destroying fix + keeping track of user connection in multiple tabs (#705)
* MYFACES-4660 - NOT destroying the session when destroying the view
When was the view scope destroyed, session scope channel tokens was also destroyed (although session was still alive). Destroying of the session scope channelToken is left to the automatic destroying of the SessionScope.
(cherry picked from commit 2e14d4c110d51cd3661333f05b6b18b5f0565e11)
* MYFACES-4660 - tracking the number of channel tokens used by the user
The number of channelToken used by user is tracked (increases when new connection is opened (in the same http session, ie new browser tab), decreased when the connection is closed). The channelToken is kept tracked until all connections are closed.
(cherry picked from commit b2cfa1921278dcb1bd33e2ad7f8854bcf780f196)
---
.../myfaces/push/cdi/WebsocketScopeManager.java | 16 +---------
.../myfaces/push/cdi/WebsocketSessionManager.java | 34 ++++++++++++++++------
2 files changed, 26 insertions(+), 24 deletions(-)
diff --git a/impl/src/main/java/org/apache/myfaces/push/cdi/WebsocketScopeManager.java b/impl/src/main/java/org/apache/myfaces/push/cdi/WebsocketScopeManager.java
index a08c77db6..ca7b88bf6 100644
--- a/impl/src/main/java/org/apache/myfaces/push/cdi/WebsocketScopeManager.java
+++ b/impl/src/main/java/org/apache/myfaces/push/cdi/WebsocketScopeManager.java
@@ -161,26 +161,12 @@ public static class ViewScope extends AbstractUserScope implements Serializable
@Inject private WebsocketScopeManager scopeManager;
@Inject private WebsocketSessionManager sessionManager;
- /*
- * If the view is discarded, destroy the websocket sessions associated with the view because they are no
- * longer valid
- */
@PreDestroy
public void destroy()
{
- // destroy parent scope ("session")
- SessionScope sessionScope = (SessionScope) scopeManager.getScope(SCOPE_SESSION, false);
- if (sessionScope != null)
- {
- for (String token : tokens.keySet())
- {
- sessionScope.destroyChannelToken(token);
- }
- }
-
channelTokens.clear();
tokens.clear();
- }
+ }
}
diff --git a/impl/src/main/java/org/apache/myfaces/push/cdi/WebsocketSessionManager.java b/impl/src/main/java/org/apache/myfaces/push/cdi/WebsocketSessionManager.java
index c9ac6069e..7e39ab22c 100644
--- a/impl/src/main/java/org/apache/myfaces/push/cdi/WebsocketSessionManager.java
+++ b/impl/src/main/java/org/apache/myfaces/push/cdi/WebsocketSessionManager.java
@@ -59,7 +59,8 @@ public class WebsocketSessionManager
{
private Lazy<ConcurrentLRUCache<String, Collection<Reference<Session>>>> sessionMap;
- private Lazy<ConcurrentHashMap<UserChannelKey, Set<String>>> userMap;
+ // map is holding relation between user / channel and channel token with number of used connections
+ private Lazy<ConcurrentHashMap<UserChannelKey, ConcurrentMap<String, Integer>>> userMap;
private Queue<String> restoreQueue;
private static final CloseReason REASON_EXPIRED = new CloseReason(NORMAL_CLOSURE, "Expired");
@@ -83,7 +84,7 @@ public ConcurrentLRUCache<String, Collection<Reference<Session>>> getSessionMap(
return sessionMap.get();
}
- public ConcurrentMap<UserChannelKey, Set<String>> getUserMap()
+ public ConcurrentMap<UserChannelKey, ConcurrentMap<String, Integer>> getUserMap()
{
return userMap.get();
}
@@ -101,8 +102,10 @@ public void registerUser(Serializable user, String channel, String channelToken)
{
UserChannelKey userChannelKey = new UserChannelKey(user, channel);
- Set<String> channelTokenSet = getUserMap().computeIfAbsent(userChannelKey, k -> new HashSet<>(1));
- channelTokenSet.add(channelToken);
+ ConcurrentMap<String, Integer> channelTokenMap = getUserMap().computeIfAbsent(userChannelKey,
+ k -> new ConcurrentHashMap<>(1));
+ // +1 for new connection of user
+ channelTokenMap.compute(channelToken, (key, value) -> value == null ? 1 : ++value);
}
public void deregisterUser(Serializable user, String channel, String channelToken)
@@ -111,11 +114,23 @@ public void deregisterUser(Serializable user, String channel, String channelToke
synchronized (getUserMap())
{
- Set<String> channelTokenSet = getUserMap().get(userChannelKey);
- if (channelTokenSet != null)
+ ConcurrentMap<String, Integer> channelTokenMap = getUserMap().get(userChannelKey);
+ if (channelTokenMap != null)
{
- channelTokenSet.remove(channelToken);
- if (channelTokenSet.isEmpty())
+ int value = channelTokenMap.get(channelToken);
+ if (value == 1)
+ {
+ // let's remove it from the map
+ channelTokenMap.remove(channelToken);
+ }
+ else
+ {
+ // -1 for connection of user
+ channelTokenMap.put(channelToken, --value);
+ }
+
+ // let's remove channelToken if no more user connections
+ if (channelTokenMap.isEmpty())
{
getUserMap().remove(userChannelKey);
}
@@ -126,7 +141,8 @@ public void deregisterUser(Serializable user, String channel, String channelToke
public Set<String> getChannelTokensForUser(Serializable user, String channel)
{
UserChannelKey userChannelKey = new UserChannelKey(user, channel);
- return getUserMap().get(userChannelKey);
+ // just for compatibility, returning keySet
+ return getUserMap().get(userChannelKey).keySet();
}
public void initSessionMap(ExternalContext context)