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 14:30:39 UTC
[myfaces] branch master updated: use same config
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 0552df5 use same config
0552df5 is described below
commit 0552df597e3a9eaf7a9288c5693b786e8d259baa
Author: Thomas Andraschko <ta...@apache.org>
AuthorDate: Wed Mar 17 15:30:31 2021 +0100
use same config
---
.../org/apache/myfaces/config/MyfacesConfig.java | 24 ----------------------
.../flow/cdi/FlowScopeContextualStorageHolder.java | 6 +++---
2 files changed, 3 insertions(+), 27 deletions(-)
diff --git a/impl/src/main/java/org/apache/myfaces/config/MyfacesConfig.java b/impl/src/main/java/org/apache/myfaces/config/MyfacesConfig.java
index b480988..9c9f65a 100755
--- a/impl/src/main/java/org/apache/myfaces/config/MyfacesConfig.java
+++ b/impl/src/main/java/org/apache/myfaces/config/MyfacesConfig.java
@@ -329,20 +329,6 @@ public class MyfacesConfig
"org.apache.myfaces.NUMBER_OF_FLASH_TOKENS_IN_SESSION";
/**
- * Indicate the max number of client window ids stored into session by faces flow. It is only active when
- * jakarta.faces.CLIENT_WINDOW_MODE is enabled and jakarta.faces.STATE_SAVING_METHOD is set
- * to "server". This param is related to the limit of active client
- * windows per session, and it is used to cleanup flow scope beans when a client window or view becomes
- * invalid.
- * By default is the same number as in
- * (org.apache.myfaces.NUMBER_OF_VIEWS_IN_SESSION /
- * org.apache.myfaces.NUMBER_OF_SEQUENTIAL_VIEWS_IN_SESSION) + 1 = 6.
- */
- @JSFWebConfigParam(since="2.2.6", group="state", tags="performance")
- public static final String NUMBER_OF_FACES_FLOW_CLIENT_WINDOW_IDS_IN_SESSION =
- "org.apache.myfaces.FACES_FLOW_CLIENT_WINDOW_IDS_IN_SESSION";
-
- /**
* Indicate the max number of ClientWindows stored into session. It is only active when
* jakarta.faces.CLIENT_WINDOW_MODE is enabled and jakarta.faces.STATE_SAVING_METHOD is set
* to "server".
@@ -840,7 +826,6 @@ public class MyfacesConfig
private Integer numberOfSequentialViewsInSession = NUMBER_OF_SEQUENTIAL_VIEWS_IN_SESSION_DEFAULT;
private Integer numberOfFlashTokensInSession;
private Integer numberOfClientWindowsInSession;
- private Integer numberOfFacesFlowClientWindowIdsInSession;
private boolean supportEL3ImportHandler = SUPPORT_EL_3_IMPORT_HANDLER_DEFAULT;
private boolean strictJsf2OriginHeaderAppPath = STRICT_JSF_2_ORIGIN_HEADER_APP_PATH_DEFAULT;
private int resourceBufferSize = RESOURCE_BUFFER_SIZE_DEFAULT;
@@ -1111,10 +1096,6 @@ public class MyfacesConfig
cfg.numberOfFlashTokensInSession = getInt(extCtx, NUMBER_OF_FLASH_TOKENS_IN_SESSION,
numberOfFlashTokensInSessionDefault);
- cfg.numberOfFacesFlowClientWindowIdsInSession = getInt(extCtx,
- NUMBER_OF_FACES_FLOW_CLIENT_WINDOW_IDS_IN_SESSION,
- numberOfFlashTokensInSessionDefault);
-
cfg.numberOfClientWindowsInSession = getInt(extCtx,
NUMBER_OF_CLIENT_WINDOWS_IN_SESSION,
NUMBER_OF_CLIENT_WINDOWS_IN_SESSION_DEFAULT);
@@ -1521,11 +1502,6 @@ public class MyfacesConfig
return numberOfFlashTokensInSession;
}
- public Integer getNumberOfFacesFlowClientWindowIdsInSession()
- {
- return numberOfFacesFlowClientWindowIdsInSession;
- }
-
public boolean isSupportEL3ImportHandler()
{
return supportEL3ImportHandler;
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 22ef66c..d61f193 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
@@ -80,9 +80,9 @@ public class FlowScopeContextualStorageHolder
FacesContext facesContext = FacesContext.getCurrentInstance();
- Integer numberOfFacesFlowClientWindowIdsInSession =
- MyfacesConfig.getCurrentInstance(facesContext).getNumberOfFacesFlowClientWindowIdsInSession();
- clientWindowExpirationStack = new LRULinkedHashMap<>(numberOfFacesFlowClientWindowIdsInSession, (eldest) ->
+ Integer numberOfClientWindowsInSession =
+ MyfacesConfig.getCurrentInstance(facesContext).getNumberOfClientWindowsInSession();
+ clientWindowExpirationStack = new LRULinkedHashMap<>(numberOfClientWindowsInSession, (eldest) ->
{
clearFlowMap(FacesContext.getCurrentInstance(), eldest.getKey());
});