Update of /var/cvs/src/org/mmbase/framework/basic
In directory james.mmbase.org:/tmp/cvs-serv1530
Modified Files:
BasicFramework.java
Log Message:
made sub-blocks work
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.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- BasicFramework.java 6 Aug 2008 12:00:11 -0000 1.21
+++ BasicFramework.java 6 Aug 2008 12:19:28 -0000 1.22
@@ -34,7 +34,7 @@
* are configured is the order in which they are processed.
*
* @author Michiel Meeuwissen
- * @version $Id: BasicFramework.java,v 1.21 2008/08/06 12:00:11 michiel Exp $
+ * @version $Id: BasicFramework.java,v 1.22 2008/08/06 12:19:28 michiel Exp $
* @since MMBase-1.9
*/
public class BasicFramework extends Framework {
@@ -250,7 +250,11 @@
public void render(Renderer renderer, Parameters blockParameters,
Parameters frameworkParameters, Writer w, Renderer.WindowState windowState)
throws FrameworkException {
ServletRequest request = frameworkParameters.get(Parameter.REQUEST);
if (request == null) throw new IllegalArgumentException("No request
object given");
+
State state = State.getState(request);
+ if (state.isRendering()) { // mm:component used during rending of a
component, that's fine, but use a new State.
+ state = new State(request);
+ }
try {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
