[MMBASE CVS] applications/taglib/src/org/mmbase/bridge/jsp/taglib/containers ListRelationsContainerTag.java

[Michiel Meeuwissen]

Update of 
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/containers
In directory james.mmbase.org:/tmp/cvs-serv28507

Modified Files:
        ListRelationsContainerTag.java 
Log Message:
  MMB-1668


See also: 
http://cvs.mmbase.org/viewcvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/containers
See also: http://www.mmbase.org/jira/browse/MMB-1668


Index: ListRelationsContainerTag.java
===================================================================
RCS file: 
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/containers/ListRelationsContainerTag.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- ListRelationsContainerTag.java      26 Feb 2008 15:45:02 -0000      1.18
+++ ListRelationsContainerTag.java      27 Jun 2008 14:39:25 -0000      1.19
@@ -24,11 +24,12 @@
  *
  * @author Michiel Meeuwissen
  * @since  MMBase-1.7
- * @version $Id: ListRelationsContainerTag.java,v 1.18 2008/02/26 15:45:02 
michiel Exp $
+ * @version $Id: ListRelationsContainerTag.java,v 1.19 2008/06/27 14:39:25 
michiel Exp $
  */
 public class ListRelationsContainerTag extends NodeReferrerTag implements 
NodeQueryContainer {
 
     private NodeQuery   query        = null;
+    private Object      prevQuery    = null;
     private NodeQuery   relatedQuery        = null;
     private Attribute cachePolicy  = Attribute.NULL;
     private Attribute type       = Attribute.NULL;
@@ -86,6 +87,7 @@
 
 
     public int doStartTag() throws JspTagException {
+        prevQuery= pageContext.getAttribute(QueryContainer.KEY, 
QueryContainer.SCOPE);
         if (getReferid() != null) {
             query = (NodeQuery) 
getContextProvider().getContextContainer().getObject(getReferid());
         } else {
@@ -109,6 +111,7 @@
         if (jspVar != null) {
             pageContext.setAttribute(jspVar, query);
         }
+        pageContext.setAttribute(QueryContainer.KEY, query, 
QueryContainer.SCOPE);
         return EVAL_BODY;
     }
 
@@ -125,6 +128,8 @@
         return SKIP_BODY;
     }
     public int doEndTag() throws JspTagException {
+        pageContext.setAttribute(KEY, prevQuery, SCOPE);
+        prevQuery = null;
         query = null;
         relatedQuery = null;
         return super.doEndTag();
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs