Update of /var/cvs/src/org/mmbase/framework/basic
In directory james.mmbase.org:/tmp/cvs-serv12300
Modified Files:
DirectoryUrlConverter.java
Log Message:
should also work if directory is configured empty
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.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- DirectoryUrlConverter.java 28 Oct 2008 17:40:26 -0000 1.14
+++ DirectoryUrlConverter.java 29 Oct 2008 14:35:49 -0000 1.15
@@ -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.14 2008/10/28 17:40:26 michiel
Exp $
+ * @version $Id: DirectoryUrlConverter.java,v 1.15 2008/10/29 14:35:49 michiel
Exp $
* @since MMBase-1.9
* @todo EXPERIMENTAL
*/
@@ -81,7 +81,8 @@
log.debug("pa " + pa + " -> " + path + " (Not long enough for " +
this + ")");
return Url.NOT;
}
- return getFilteredInternalDirectoryUrl(path.subList(2, path.size()),
params, frameworkParameters);
+ return getFilteredInternalDirectoryUrl(path.subList(directory.length()
> 1 ? 2 : 1, // should also work correctly if directory is empty
+ path.size()),
params, frameworkParameters);
}
protected abstract Url getFilteredInternalDirectoryUrl(List<String> path,
Map<String, Object> params, Parameters frameworkParameters) throws
FrameworkException;
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
