diff options
| -rw-r--r-- | WebContent/release-notes.html | 1 | ||||
| -rw-r--r-- | server/src/com/vaadin/server/DefaultDeploymentConfiguration.java | 14 |
2 files changed, 11 insertions, 4 deletions
diff --git a/WebContent/release-notes.html b/WebContent/release-notes.html index fc1d69fd24..828aa193b9 100644 --- a/WebContent/release-notes.html +++ b/WebContent/release-notes.html @@ -144,6 +144,7 @@ @Inherited. The annotation is also looked up in extended interfaces for backwards compatibility.</li> <li>Server-side timings of request processing are only sent to the client when not in production mode. Using the timings in TestBench tests requires the server not to be in production mode.</li> + <li>System properties now override application parameters for settings such as production mode.</li> </ul> <h3 id="knownissues">Known Issues and Limitations</h3> <ul> diff --git a/server/src/com/vaadin/server/DefaultDeploymentConfiguration.java b/server/src/com/vaadin/server/DefaultDeploymentConfiguration.java index b26e048431..1f22a9e33d 100644 --- a/server/src/com/vaadin/server/DefaultDeploymentConfiguration.java +++ b/server/src/com/vaadin/server/DefaultDeploymentConfiguration.java @@ -125,14 +125,14 @@ public class DefaultDeploymentConfiguration extends String defaultValue) { String val = null; - // Try application properties - val = getApplicationProperty(propertyName); + // Try system properties + val = getSystemProperty(propertyName); if (val != null) { return val; } - // Try system properties - val = getSystemProperty(propertyName); + // Try application properties + val = getApplicationProperty(propertyName); if (val != null) { return val; } @@ -175,6 +175,12 @@ public class DefaultDeploymentConfiguration extends // Try lowercased system properties val = System.getProperty(pkgName + parameterName.toLowerCase()); + if (val != null) { + return val; + } + + // version prefixed with just "vaadin." + val = System.getProperty("vaadin." + parameterName); return val; } |