Update of /var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/pageflow
In directory james.mmbase.org:/tmp/cvs-serv20932
Modified Files:
Url.java UrlTag.java
Log Message:
Another small detail related to MMB-1777
See also:
http://cvs.mmbase.org/viewcvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/pageflow
See also: http://www.mmbase.org/jira/browse/MMB-1777
Index: Url.java
===================================================================
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/pageflow/Url.java,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- Url.java 26 Jan 2009 12:48:14 -0000 1.55
+++ Url.java 26 Jan 2009 13:33:43 -0000 1.56
@@ -35,7 +35,7 @@
* <p>
* The creation of the URL is delegated to the MMBase framework.
* </p>
- * @version $Id: Url.java,v 1.55 2009/01/26 12:48:14 michiel Exp $;
+ * @version $Id: Url.java,v 1.56 2009/01/26 13:33:43 michiel Exp $;
* @since MMBase-1.9
*/
public class Url implements Comparable, CharSequence, Casting.Unwrappable {
@@ -43,7 +43,7 @@
private static final Logger pageLog =
Logging.getLoggerInstance(Logging.PAGE_CATEGORY);
private final ContextReferrerTag tag;
- private final CharSequence page;
+ private CharSequence page;
//private final Component component;
protected final Map<String, Object> params;
protected final Map<String, Object> frameworkParams;
@@ -347,6 +347,12 @@
public int compareTo(Object o) {
return toString().compareTo(Casting.toString(o));
}
+
+ void doEndTag() {
+ // The page CharSequence may be some thing dependent on member of the
UrlTag extension
+ // This convert it to a String, which is certainly not dynamic any
more.
+ page = page.toString();
+ }
/**
* Add a key/value pair to a map, but does not replace the already
exsiting mapping.
* In stead, the already mapped value is converted to a list, contain both
values.
Index: UrlTag.java
===================================================================
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/pageflow/UrlTag.java,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -b -r1.126 -r1.127
--- UrlTag.java 26 Jan 2009 12:41:04 -0000 1.126
+++ UrlTag.java 26 Jan 2009 13:33:43 -0000 1.127
@@ -30,7 +30,7 @@
* A Tag to produce an URL with parameters. It can use 'context' parameters
easily.
*
* @author Michiel Meeuwissen
- * @version $Id: UrlTag.java,v 1.126 2009/01/26 12:41:04 michiel Exp $
+ * @version $Id: UrlTag.java,v 1.127 2009/01/26 13:33:43 michiel Exp $
*/
public class UrlTag extends CloudReferrerTag implements ParamHandler,
FrameworkParamHandler {
@@ -347,15 +347,19 @@
}
if (getId() != null) {
parameters.getWrapped(true); // dereference, and calculate
+
}
pageContext.setAttribute(ParamHandler.KEY, prevParamHandler,
ParamHandler.SCOPE);
prevParamHandler = null;
+ url.doEndTag();
initDoEndTag();
doAfterBodySetValue();
helper.doEndTag();
extraParameters = null;
frameworkParameters = null;
parameters = null;
+ // url = null;
+
return super.doEndTag();
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
