Repository: wicket Updated Branches: refs/heads/wicket-6.x 03d94aae2 -> 2de1284a5
WICKET-5816 Apps can't use Application.setName instead of WicketFilter for e.g. JMX names (cherry picked from commit 792a0a4138aad61dfe63c8bace96648878767003) Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/2de1284a Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/2de1284a Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/2de1284a Branch: refs/heads/wicket-6.x Commit: 2de1284a589f7862133bb2c2166bf8563268d252 Parents: 03d94aa Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Fri Mar 27 23:27:04 2015 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Fri Mar 27 23:27:26 2015 +0200 ---------------------------------------------------------------------- .../main/java/org/apache/wicket/protocol/http/WicketFilter.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/2de1284a/wicket-core/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java index 1c87f0e..ee396b4 100644 --- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java +++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java @@ -385,7 +385,10 @@ public class WicketFilter implements Filter application = applicationFactory.createApplication(this); } - application.setName(filterConfig.getFilterName()); + if (application.getName() == null) + { + application.setName(filterConfig.getFilterName()); + } application.setWicketFilter(this); // Allow the filterPath to be preset via setFilterPath()
