You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2015/03/27 22:27:20 UTC
wicket git commit: WICKET-5816 Apps can't use Application.setName
instead of WicketFilter for e.g. JMX names
Repository: wicket
Updated Branches:
refs/heads/master 55f164e4b -> 792a0a413
WICKET-5816 Apps can't use Application.setName instead of WicketFilter for e.g. JMX names
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/792a0a41
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/792a0a41
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/792a0a41
Branch: refs/heads/master
Commit: 792a0a4138aad61dfe63c8bace96648878767003
Parents: 55f164e
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Mar 27 23:27:04 2015 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Mar 27 23:27:04 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/792a0a41/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 2573e63..ec35b62 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
@@ -387,7 +387,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()