[MMBASE CVS] src/org/mmbase/framework Framework.java FrameworkFilter.java

[Michiel Meeuwissen]

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

Modified Files:
        Framework.java FrameworkFilter.java 
Log Message:
made it so that 'getUrl' on UrlConvertor may return null (for chaining). 
Framework may however _not_ return nul (so getUrl always works). getInteralUrl 
may give null in both cases. /version?<argument> works again now


See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/framework


Index: Framework.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/Framework.java,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- Framework.java      25 Mar 2008 21:00:24 -0000      1.50
+++ Framework.java      18 Apr 2008 13:47:13 -0000      1.51
@@ -27,7 +27,7 @@
  *
  * @author Johannes Verelst
  * @author Pierre van Rooden
- * @version $Id: Framework.java,v 1.50 2008/03/25 21:00:24 nklasens Exp $
+ * @version $Id: Framework.java,v 1.51 2008/04/18 13:47:13 michiel Exp $
  * @since MMBase-1.9
  */
 public abstract class Framework {
@@ -231,7 +231,7 @@
      * @param escapeAmps <code>true</code> if parameters should be added with 
an escaped &amp; (&amp;amp;).
      *                   You should escape &amp; when a URL is exposed (i.e. 
in HTML), but not if the url is
      *                   for some reason called directly.
-     * @return An URL relative to the root of this web application (i.e. 
without a context path),
+     * @return An URL relative to the root of this web application (i.e. 
without a context path), Never <code>null</code>.
      * @throws FrameworkException thrown when something goes wrong in the 
Framework
      */
     public abstract String getUrl(String path,


Index: FrameworkFilter.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/FrameworkFilter.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- FrameworkFilter.java        21 Mar 2008 12:03:27 -0000      1.23
+++ FrameworkFilter.java        18 Apr 2008 13:47:13 -0000      1.24
@@ -35,7 +35,7 @@
  * 'excludes' parameter in web.xml.
  *
  * @author Andr&eacute; van Toly
- * @version $Id: FrameworkFilter.java,v 1.23 2008/03/21 12:03:27 michiel Exp $
+ * @version $Id: FrameworkFilter.java,v 1.24 2008/04/18 13:47:13 michiel Exp $
  */
 
 public class FrameworkFilter implements Filter, MMBaseStarter  {
@@ -167,6 +167,11 @@
 
             // URL is not excluded, pass it to UrlConverter to process and 
forward the request
             Framework fw =  Framework.getInstance();
+            if (fw == null) {
+                log.error("No MMBase framework found");
+                chain.doFilter(request, response);
+                return;
+            }
             Parameters params = fw.createParameters();
             if (params.containsParameter(Parameter.REQUEST)) {
                 params.set(Parameter.REQUEST, req);
@@ -175,7 +180,7 @@
                 params.set(Parameter.RESPONSE, res);
             }
             try {
-                String forwardUrl = fw.getInternalUrl(path, 
req.getParameterMap(), params).toString();
+                String forwardUrl = fw.getInternalUrl(path, 
req.getParameterMap(), params);
 
                 if (log.isDebugEnabled()) {
                     log.debug("Received '" + forwardUrl + "' from framework, 
forwarding. rp:" + req.getParameterMap() + " fwp:" + params);
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs