#4743: Merge remote-tracking branch 'origin/2.3' into 3.0

eclipse-ee4j · Feb 20, 2022 · 2fef22d · 2fef22d
1 parent e879705
commit 2fef22d
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/impl/src/main/java/com/sun/faces/renderkit/ClientSideStateHelper.java b/impl/src/main/java/com/sun/faces/renderkit/ClientSideStateHelper.java
@@ -21,6 +21,7 @@
 import static com.sun.faces.config.WebConfiguration.WebContextInitParameter.ClientStateTimeout;
 import static com.sun.faces.config.WebConfiguration.WebContextInitParameter.ClientStateWriteBufferSize;
 import static com.sun.faces.renderkit.RenderKitUtils.PredefinedPostbackParameter.VIEW_STATE_PARAM;
+import static java.util.logging.Level.WARNING;
 
 import java.io.BufferedOutputStream;
 import java.io.ByteArrayInputStream;
@@ -434,8 +435,16 @@ protected void init() {
             String timeout = webConfig.getOptionValue(ClientStateTimeout);
             try {
                 stateTimeout = Long.parseLong(timeout);
+
+                if (stateTimeout < 0) {
+                    stateTimeoutEnabled = false;
+                }
             } catch (NumberFormatException nfe) {
-                stateTimeout = Long.parseLong(ClientStateTimeout.getDefaultValue());
+                if (LOGGER.isLoggable(WARNING)) {
+                    LOGGER.log(WARNING, ClientStateTimeout.getQualifiedName() + " context param value of '" + timeout + "' is not parseable as Long, it will be ignored");
+                }
+
+                stateTimeoutEnabled = false;
             }
         }