git commit: WICKET-5034 added not to keep filter-mapping for WicketFilter listed before WicketSessionFilter in web.xml

[sv...@apache.org]

Updated Branches:
  refs/heads/master 2706cc7c9 -> 3a3aed918


WICKET-5034 added not to keep filter-mapping for WicketFilter
listed before WicketSessionFilter in web.xml

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

Branch: refs/heads/master
Commit: 3a3aed9189307c886d31ab34322137a2a98eae69
Parents: 2706cc7
Author: svenmeier <sv...@apache.org>
Authored: Tue Feb 12 22:34:34 2013 +0100
Committer: svenmeier <sv...@apache.org>
Committed: Tue Feb 12 22:34:34 2013 +0100

----------------------------------------------------------------------
 .../protocol/http/servlet/WicketSessionFilter.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/3a3aed91/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/WicketSessionFilter.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/WicketSessionFilter.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/WicketSessionFilter.java
index f72f5f3..030ffa4 100644
--- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/WicketSessionFilter.java
+++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/WicketSessionFilter.java
@@ -31,14 +31,13 @@ import org.apache.wicket.Application;
 import org.apache.wicket.Session;
 import org.apache.wicket.ThreadContext;
 import org.apache.wicket.protocol.http.WebApplication;
+import org.apache.wicket.protocol.http.WicketFilter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * <p>
  * This filter can be used to make the Wicket {@link org.apache.wicket.protocol.http.WebSession}
  * instances available to non-wicket servlets.
- * </p>
  * <p>
  * The following example shows how this filter is setup to for a servlet. You can find the example
  * in the wicket-examples project.
@@ -73,6 +72,10 @@ import org.slf4j.LoggerFactory;
  *  &lt;/servlet-mapping&gt;
  * </pre>
  * 
+ * Note: If both {@link WicketFilter} and {@link WicketSessionFilter} are mapped to the same url
+ * pattern, make sure to have the {@code <filter-mapping>} for {@link WicketFilter} first in your
+ * {@code web.xml}.
+ * <p>
  * After that, you can get to the Wicket session in the usual fashion:
  * 
  * <pre>