diff options
Diffstat (limited to 'server/src/com/vaadin/terminal')
| -rw-r--r-- | server/src/com/vaadin/terminal/DeploymentConfiguration.java | 3 | ||||
| -rw-r--r-- | server/src/com/vaadin/terminal/gwt/server/AbstractDeploymentConfiguration.java | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/server/src/com/vaadin/terminal/DeploymentConfiguration.java b/server/src/com/vaadin/terminal/DeploymentConfiguration.java index 550bfdb7cf..7d006812b9 100644 --- a/server/src/com/vaadin/terminal/DeploymentConfiguration.java +++ b/server/src/com/vaadin/terminal/DeploymentConfiguration.java @@ -155,7 +155,8 @@ public interface DeploymentConfiguration extends Serializable { public int getResourceCacheTime(); /** - * Returns the number of seconds between heartbeat requests of a root. + * Returns the number of seconds between heartbeat requests of a root, or a + * non-negative number if heartbeat is disabled. * * @return */ diff --git a/server/src/com/vaadin/terminal/gwt/server/AbstractDeploymentConfiguration.java b/server/src/com/vaadin/terminal/gwt/server/AbstractDeploymentConfiguration.java index 3e7f1eaf71..d2cc4a2eea 100644 --- a/server/src/com/vaadin/terminal/gwt/server/AbstractDeploymentConfiguration.java +++ b/server/src/com/vaadin/terminal/gwt/server/AbstractDeploymentConfiguration.java @@ -228,11 +228,11 @@ public abstract class AbstractDeploymentConfiguration implements try { heartbeatInterval = Integer .parseInt(getApplicationOrSystemProperty( - Constants.SERVLET_PARAMETER_HEARTBEAT_RATE, "500")); + Constants.SERVLET_PARAMETER_HEARTBEAT_RATE, "300")); } catch (NumberFormatException e) { getLogger().warning( Constants.WARNING_HEARTBEAT_INTERVAL_NOT_NUMERIC); - heartbeatInterval = 500; + heartbeatInterval = 300; } } |