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 2021/03/17 12:38:36 UTC
[myfaces] branch master updated: added synchronization back
This is an automated email from the ASF dual-hosted git repository.
tandraschko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces.git
The following commit(s) were added to refs/heads/master by this push:
new 0da8c82 added synchronization back
0da8c82 is described below
commit 0da8c82567f9de6a6d1d3e57edfd9228e40679d8
Author: Thomas Andraschko <ta...@apache.org>
AuthorDate: Wed Mar 17 13:38:28 2021 +0100
added synchronization back
---
.../cdi/clientwindow/ClientWindowScopeContextualStorageHolder.java | 7 +++++--
.../apache/myfaces/flow/cdi/FlowScopeContextualStorageHolder.java | 7 +++++--
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/clientwindow/ClientWindowScopeContextualStorageHolder.java b/impl/src/main/java/org/apache/myfaces/cdi/clientwindow/ClientWindowScopeContextualStorageHolder.java
index e9c07b9..2481619 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/clientwindow/ClientWindowScopeContextualStorageHolder.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/clientwindow/ClientWindowScopeContextualStorageHolder.java
@@ -87,8 +87,11 @@ public class ClientWindowScopeContextualStorageHolder
{
if (clientWindow != null && clientWindow.getId() != null)
{
- clientWindowExpirationStack.remove(clientWindow.getId());
- clientWindowExpirationStack.put(clientWindow.getId(), "");
+ synchronized (clientWindowExpirationStack)
+ {
+ clientWindowExpirationStack.remove(clientWindow.getId());
+ clientWindowExpirationStack.put(clientWindow.getId(), "");
+ }
}
}
diff --git a/impl/src/main/java/org/apache/myfaces/flow/cdi/FlowScopeContextualStorageHolder.java b/impl/src/main/java/org/apache/myfaces/flow/cdi/FlowScopeContextualStorageHolder.java
index bc01556..22ef66c 100644
--- a/impl/src/main/java/org/apache/myfaces/flow/cdi/FlowScopeContextualStorageHolder.java
+++ b/impl/src/main/java/org/apache/myfaces/flow/cdi/FlowScopeContextualStorageHolder.java
@@ -123,8 +123,11 @@ public class FlowScopeContextualStorageHolder
ClientWindow cw = facesContext.getExternalContext().getClientWindow();
if (cw != null && cw.getId() != null)
{
- clientWindowExpirationStack.remove(cw.getId());
- clientWindowExpirationStack.put(cw.getId(), "");
+ synchronized (clientWindowExpirationStack)
+ {
+ clientWindowExpirationStack.remove(cw.getId());
+ clientWindowExpirationStack.put(cw.getId(), "");
+ }
}
}