[MMBASE CVS] contributions/didactor2/src/core/java/nl/didactor/filter DidactorUrlConverter.java

[Michiel Meeuwissen]

Update of /var/cvs/contributions/didactor2/src/core/java/nl/didactor/filter
In directory james.mmbase.org:/tmp/cvs-serv8346/filter

Modified Files:
        DidactorUrlConverter.java 
Log Message:



See also: 
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/core/java/nl/didactor/filter


Index: DidactorUrlConverter.java
===================================================================
RCS file: 
/var/cvs/contributions/didactor2/src/core/java/nl/didactor/filter/DidactorUrlConverter.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- DidactorUrlConverter.java   21 Oct 2008 16:24:33 -0000      1.7
+++ DidactorUrlConverter.java   22 Oct 2008 08:37:18 -0000      1.8
@@ -20,7 +20,7 @@
 
  *
  * @author Michiel Meeuwissen
- * @version $Id: DidactorUrlConverter.java,v 1.7 2008/10/21 16:24:33 michiel 
Exp $
+ * @version $Id: DidactorUrlConverter.java,v 1.8 2008/10/22 08:37:18 michiel 
Exp $
  */
 public class DidactorUrlConverter extends DirectoryUrlConverter {
     private static final Logger log = 
Logging.getLoggerInstance(DidactorUrlConverter.class);
@@ -55,10 +55,12 @@
     }
 
 
-    @Override protected String getFilteredInternalDirectoryUrl(List<String> 
path, Map<String, Object> blockParameters, Parameters frameworkParameters) {
+    @Override protected String getFilteredInternalDirectoryUrl(List<String> 
path, Map<String, Object> blockParameters, Parameters frameworkParameters) 
throws FrameworkException {
         StringBuilder result = new StringBuilder("/shared/render.jspx");
         // article mode
+        if (path.size() == 0) throw new FrameworkException("No component in 
path");
         Component component = 
ComponentRepository.getInstance().getComponent(path.get(0));
+        if (component == null) throw new FrameworkException("No didactor 
component in " + path);
         Setting<String> setting = (Setting<String>) 
component.getSetting("didactor_nodeprovider");
         String value = "education";
         HttpServletRequest request = 
frameworkParameters.get(Parameter.REQUEST);
@@ -74,7 +76,7 @@
 
         result.append("?name=");
         result.append(component.getName());
-        Block block = path.size() > 0 ? component.getBlock(path.get(1)) : 
component.getDefaultBlock();
+        Block block = path.size() > 1 ? component.getBlock(path.get(1)) : 
component.getDefaultBlock();
         if (block == null) return null;
         result.append("&block=");
         result.append(block.getName());
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs