Updated Branches: refs/heads/master a7ce7f913 -> 01b6dae91
WICKET-4737 IllegalStateException on WicketFilter.init() after calling setFilterPath() Allow to preset the filter path. Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/01b6dae9 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/01b6dae9 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/01b6dae9 Branch: refs/heads/master Commit: 01b6dae91fa8eb0860c34f50ccc110fe46aab9ea Parents: a7ce7f9 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Thu Aug 30 19:54:46 2012 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Thu Aug 30 19:55:28 2012 +0200 ---------------------------------------------------------------------- .../apache/wicket/protocol/http/WicketFilter.java | 26 +++++++------- 1 files changed, 13 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/01b6dae9/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 c8f2750..681a6a1 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 @@ -348,26 +348,26 @@ public class WicketFilter implements Filter if (configureFilterPath == null) { configureFilterPath = getFilterPathFromConfig(filterConfig); - } - if (configureFilterPath == null) - { - configureFilterPath = getFilterPathFromWebXml(isServlet, filterConfig); - } + if (configureFilterPath == null) + { + configureFilterPath = getFilterPathFromWebXml(isServlet, filterConfig); - if (configureFilterPath == null) - { - configureFilterPath = getFilterPathFromAnnotation(isServlet); - } + if (configureFilterPath == null) + { + configureFilterPath = getFilterPathFromAnnotation(isServlet); + } + } - if (configureFilterPath != null) - { - setFilterPath(configureFilterPath); + if (configureFilterPath != null) + { + setFilterPath(configureFilterPath); + } } if (getFilterPath() == null) { - log.warn("Unable to determine filter path from filter init-parm, web.xml, " + log.warn("Unable to determine filter path from filter init-param, web.xml, " + "or servlet 3.0 annotations. Assuming user will set filter path " + "manually by calling setFilterPath(String)"); }
