You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by eh...@apache.org on 2006/10/15 15:25:33 UTC
svn commit: r464186 -
/incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/WicketFilter.java
Author: ehillenius
Date: Sun Oct 15 06:25:31 2006
New Revision: 464186
URL: http://svn.apache.org/viewvc?view=rev&rev=464186
Log:
test should be on null; when not the path is not set, set it from the request.
Modified:
incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/WicketFilter.java
Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/WicketFilter.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/WicketFilter.java?view=diff&rev=464186&r1=464185&r2=464186
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/WicketFilter.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/WicketFilter.java Sun Oct 15 06:25:31 2006
@@ -273,17 +273,17 @@
{
if (rootPath == null)
{
- String contextPath = webApplication.getApplicationSettings().getContextPath();
- if (contextPath == null)
+ String path = webApplication.getApplicationSettings().getContextPath();
+ if (path == null)
{
- contextPath = request.getContextPath();
- if (contextPath == null)
+ path = request.getContextPath();
+ if (path == null)
{
- contextPath = "";
+ path = "";
}
}
- if (SERVLET_PATH_HOLDER.equals(filterPath))
+ if (filterPath == null)
{
filterPath = request.getServletPath();
if (filterPath.startsWith("/"))
@@ -291,13 +291,13 @@
filterPath = filterPath.substring(1);
}
}
- if (!contextPath.endsWith("/"))
+ if (!path.endsWith("/"))
{
- rootPath = contextPath + "/" + filterPath;
+ rootPath = path + "/" + filterPath;
}
else
{
- rootPath = contextPath + filterPath;
+ rootPath = path + filterPath;
}
}
return rootPath;
@@ -325,10 +325,6 @@
filterConfig.getServletContext().setAttribute(contextKey, this.webApplication);
filterPath = filterConfig.getInitParameter(FILTER_PATH_PARAM);
- if (filterPath == null)
- {
- filterPath = "";
- }
try
{