Updated Branches:
  refs/heads/wicket-1.5.x 041b0cde4 -> fb09a1c3f

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/fb09a1c3
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/fb09a1c3
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/fb09a1c3

Branch: refs/heads/wicket-1.5.x
Commit: fb09a1c3f3a9f7bcdac51669c6e2787610dda69b
Parents: 041b0cde
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:48:12 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/fb09a1c3/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 4cfbefc..6a70eda 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
@@ -652,7 +652,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