Updated Branches:
  refs/heads/master 8206db297 -> 58422ac77

WICKET-5492 WebApplication ignores a SecurityException when reading the 
configuration type

(cherry picked from commit e5086fa35798649fe15b77ed12f6dc09ecb9ed75)


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/58422ac7
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/58422ac7
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/58422ac7

Branch: refs/heads/master
Commit: 58422ac7732429d48c783cf8f5899f8764f7002b
Parents: 8206db2
Author: Martin Tzvetanov Grigorov <[email protected]>
Authored: Thu Jan 30 09:47:04 2014 +0100
Committer: Martin Tzvetanov Grigorov <[email protected]>
Committed: Thu Jan 30 09:47:50 2014 +0100

----------------------------------------------------------------------
 .../main/java/org/apache/wicket/protocol/http/WebApplication.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/58422ac7/wicket-core/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/main/java/org/apache/wicket/protocol/http/WebApplication.java 
b/wicket-core/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
index 5c212ed..77d508e 100644
--- 
a/wicket-core/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
+++ 
b/wicket-core/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
@@ -695,7 +695,8 @@ public abstract class WebApplication extends Application
                        }
                        catch (SecurityException e)
                        {
-                               // Ignore - we're not allowed to read system 
properties.
+                               log.warn("SecurityManager doesn't allow to read 
the configuration type from " +
+                                               "the system properties. The 
configuration type will be read from the web.xml.");
                        }
 
                        // If no system parameter check filter/servlet 
<init-param> and <context-param>

Reply via email to