Update of /var/cvs/src/org/mmbase/framework/basic
In directory james.mmbase.org:/tmp/cvs-serv8039
Modified Files:
DirectoryUrlConverter.java
Log Message:
also if explicit block, consider the component
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.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- DirectoryUrlConverter.java 1 Sep 2008 07:06:12 -0000 1.2
+++ DirectoryUrlConverter.java 1 Sep 2008 18:36:04 -0000 1.3
@@ -26,7 +26,7 @@
* #getFilteredInternalUrl}.
*
* @author Michiel Meeuwissen
- * @version $Id: DirectoryUrlConverter.java,v 1.2 2008/09/01 07:06:12 michiel
Exp $
+ * @version $Id: DirectoryUrlConverter.java,v 1.3 2008/09/01 18:36:04 michiel
Exp $
* @since MMBase-1.9
*/
public abstract class DirectoryUrlConverter implements UrlConverter {
@@ -93,6 +93,10 @@
// First explore
Block block = getExplicitBlock(frameworkParameters);
if (block != null) {
+ if (components != null && !
components.contains(block.getComponent())) {
+ log.debug("Explicit block, but not mine one");
+ return null;
+ }
if (path != null && ! "".equals(path)) throw new
IllegalArgumentException("Cannot use both 'path' argument and 'block'
parameter");
return block;
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
