diff options
| author | Johannes Dahlström <johannesd@vaadin.com> | 2012-10-18 11:51:00 +0300 |
|---|---|---|
| committer | Johannes Dahlström <johannesd@vaadin.com> | 2012-10-18 12:21:44 +0300 |
| commit | 780d076d81a35d640fbaedd134635e8216040d28 (patch) | |
| tree | 88dae066606a13c63223d21c045ff4334f9ff4c7 /server | |
| parent | 90ffa9404fbb458ffbd1a26930811fcea6037d97 (diff) | |
| download | vaadin-framework-780d076d81a35d640fbaedd134635e8216040d28.tar.gz vaadin-framework-780d076d81a35d640fbaedd134635e8216040d28.zip | |
Properly read heartbeat interval servlet parameter (#9987)
* Test that servlet parameters in general are read correctly
Change-Id: I4a015070e5ce03cff0fee10e037b4df2c3df8219
Diffstat (limited to 'server')
| -rw-r--r-- | server/src/com/vaadin/DefaultDeploymentConfiguration.java | 2 | ||||
| -rw-r--r-- | server/src/com/vaadin/server/Constants.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/server/src/com/vaadin/DefaultDeploymentConfiguration.java b/server/src/com/vaadin/DefaultDeploymentConfiguration.java index fed558c5b5..a9818f2c8b 100644 --- a/server/src/com/vaadin/DefaultDeploymentConfiguration.java +++ b/server/src/com/vaadin/DefaultDeploymentConfiguration.java @@ -219,7 +219,7 @@ public class DefaultDeploymentConfiguration implements DeploymentConfiguration { try { heartbeatInterval = Integer .parseInt(getApplicationOrSystemProperty( - Constants.SERVLET_PARAMETER_HEARTBEAT_RATE, "300")); + Constants.SERVLET_PARAMETER_HEARTBEAT_INTERVAL, "300")); } catch (NumberFormatException e) { getLogger().warning( Constants.WARNING_HEARTBEAT_INTERVAL_NOT_NUMERIC); diff --git a/server/src/com/vaadin/server/Constants.java b/server/src/com/vaadin/server/Constants.java index 60f7aa03d0..b6bfcc0495 100644 --- a/server/src/com/vaadin/server/Constants.java +++ b/server/src/com/vaadin/server/Constants.java @@ -61,7 +61,7 @@ public interface Constants { static final String SERVLET_PARAMETER_PRODUCTION_MODE = "productionMode"; static final String SERVLET_PARAMETER_DISABLE_XSRF_PROTECTION = "disable-xsrf-protection"; static final String SERVLET_PARAMETER_RESOURCE_CACHE_TIME = "resourceCacheTime"; - static final String SERVLET_PARAMETER_HEARTBEAT_RATE = "heartbeatRate"; + static final String SERVLET_PARAMETER_HEARTBEAT_INTERVAL = "heartbeatInterval"; static final String SERVLET_PARAMETER_CLOSE_IDLE_UIS = "closeIdleUIs"; static final String SERVLET_PARAMETER_UI_PROVIDER = "UIProvider"; |