Update of /var/cvs/src/org/mmbase/framework/basic
In directory james.mmbase.org:/tmp/cvs-serv17264

Modified Files:
        DirectoryUrlConverter.java 
Log Message:
when using mm:include in blocks, you could have a path which is too short


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.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- DirectoryUrlConverter.java  21 Oct 2008 15:56:53 -0000      1.7
+++ DirectoryUrlConverter.java  21 Oct 2008 17:01:11 -0000      1.8
@@ -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.7 2008/10/21 15:56:53 michiel 
Exp $
+ * @version $Id: DirectoryUrlConverter.java,v 1.8 2008/10/21 17:01:11 michiel 
Exp $
  * @since MMBase-1.9
  * @todo EXPERIMENTAL
  */
@@ -72,6 +72,10 @@
         for (String p: pa.split("/")) {
             path.add(p);
         }
+        if (path.size() < 2) {
+            log.debug("pa " + pa + " -> " + path + " (Not long enough for " + 
this + ")");
+            return null;
+        }
         return getFilteredInternalDirectoryUrl(path.subList(2, path.size()), 
params, frameworkParameters);
     }
 
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to