Update of /var/cvs/src/org/mmbase/framework/basic
In directory james.mmbase.org:/tmp/cvs-serv6793
Modified Files:
BasicFramework.java
Log Message:
fixed failing testcase with form -urls
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/framework/basic
Index: BasicFramework.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/basic/BasicFramework.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- BasicFramework.java 18 Jul 2008 12:59:58 -0000 1.19
+++ BasicFramework.java 31 Jul 2008 09:42:32 -0000 1.20
@@ -34,7 +34,7 @@
* are configured is the order in which they are processed.
*
* @author Michiel Meeuwissen
- * @version $Id: BasicFramework.java,v 1.19 2008/07/18 12:59:58 michiel Exp $
+ * @version $Id: BasicFramework.java,v 1.20 2008/07/31 09:42:32 michiel Exp $
* @since MMBase-1.9
*/
public class BasicFramework extends Framework {
@@ -84,7 +84,12 @@
HttpServletRequest request =
BasicUrlConverter.getUserRequest(frameworkParameters.get(Parameter.REQUEST));
State state = State.getState(request);
frameworkParameters.set(ACTION, state.getId());
- return urlConverter.getUrl(path, parameters, frameworkParameters,
escapeAmps);
+ String url = urlConverter.getUrl(path, parameters,
frameworkParameters, escapeAmps);
+ if (url == null) {
+ return fallbackConverter.getUrl(path, parameters,
frameworkParameters, escapeAmps);
+ } else {
+ return url;
+ }
}
public String getInternalUrl(String page, Map<String, Object> params,
Parameters frameworkParameters) throws FrameworkException {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
