Update of /var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/pageflow
In directory james.mmbase.org:/tmp/cvs-serv18083
Modified Files:
UrlParameters.java UrlTag.java
Log Message:
fixed failing test-case in /mmbase/test/test/urls
See also:
http://cvs.mmbase.org/viewcvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/pageflow
Index: UrlParameters.java
===================================================================
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/pageflow/UrlParameters.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- UrlParameters.java 11 Apr 2008 12:09:16 -0000 1.5
+++ UrlParameters.java 11 Apr 2008 14:06:53 -0000 1.6
@@ -30,7 +30,7 @@
UrlParameters(UrlTag tag) {
this.tag = tag;
}
- protected void getWrapped() {
+ protected void getWrapped(boolean dereference) {
if (wrapped == null) {
try {
wrapped = new TreeMap<String, Object>();
@@ -44,6 +44,7 @@
if (log.isDebugEnabled()) {
log.debug("url parameters " + wrapped + " " + refs + "/" +
tag.extraParameters);
}
+ if (dereference) tag = null;
} catch (JspTagException je) {
throw new RuntimeException(je);
}
@@ -52,11 +53,11 @@
}
}
public int size() {
- getWrapped();
+ getWrapped(false);
return wrapped.size();
}
public Set<Map.Entry<String, Object>> entrySet() {
- getWrapped();
+ getWrapped(false);
return wrapped.entrySet();
}
Index: UrlTag.java
===================================================================
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/pageflow/UrlTag.java,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -b -r1.115 -r1.116
--- UrlTag.java 11 Apr 2008 11:42:48 -0000 1.115
+++ UrlTag.java 11 Apr 2008 14:06:53 -0000 1.116
@@ -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.115 2008/04/11 11:42:48 michiel Exp $
+ * @version $Id: UrlTag.java,v 1.116 2008/04/11 14:06:53 michiel Exp $
*/
public class UrlTag extends CloudReferrerTag implements ParamHandler,
FrameworkParamHandler {
@@ -253,6 +253,9 @@
if (log.isDebugEnabled()) {
log.debug("endtag of url tag " + parameters + " -> " + url.get());
}
+ if (getId() != null) {
+ parameters.getWrapped(true); // dereference, and calculate
+ }
initDoEndTag();
doAfterBodySetValue();
helper.doEndTag();
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
