Update of /var/cvs/src/org/mmbase/framework/basic
In directory james.mmbase.org:/tmp/cvs-serv19939
Modified Files:
DirectoryUrlConverter.java
Log Message:
allow also <directory> without trailing slash
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/framework/basic
Index: DirectoryUrlConverter.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/basic/DirectoryUrlConverter.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- DirectoryUrlConverter.java 22 Oct 2008 08:26:33 -0000 1.9
+++ DirectoryUrlConverter.java 22 Oct 2008 17:53:16 -0000 1.10
@@ -28,7 +28,7 @@
* It is also assumed that the niceness of the URL's is basicly about one
block.
*
* @author Michiel Meeuwissen
- * @version $Id: DirectoryUrlConverter.java,v 1.9 2008/10/22 08:26:33 michiel
Exp $
+ * @version $Id: DirectoryUrlConverter.java,v 1.10 2008/10/22 17:53:16 michiel
Exp $
* @since MMBase-1.9
* @todo EXPERIMENTAL
*/
@@ -63,7 +63,8 @@
@Override public boolean isFilteredMode(Parameters frameworkParameters)
throws FrameworkException {
if (directory == null) throw new RuntimeException("Directory not set");
HttpServletRequest request =
BasicUrlConverter.getUserRequest(frameworkParameters.get(Parameter.REQUEST));
- return FrameworkFilter.getPath(request).startsWith(directory);
+ String path = FrameworkFilter.getPath(request);
+ return path.startsWith(directory) || directory.equals(path + "/");
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
