Update of /var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/tree
In directory james.mmbase.org:/tmp/cvs-serv30686
Modified Files:
Tag: MMBase-1_8
AbstractTreeReferrerListTag.java OnShrinkTag.java
TreeReferrerTag.java TreeTag.java
Log Message:
forgot to dereference some of the members
See also:
http://cvs.mmbase.org/viewcvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/tree
Index: AbstractTreeReferrerListTag.java
===================================================================
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/tree/AbstractTreeReferrerListTag.java,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -b -r1.5.2.1 -r1.5.2.2
--- AbstractTreeReferrerListTag.java 14 Feb 2008 14:21:47 -0000 1.5.2.1
+++ AbstractTreeReferrerListTag.java 14 Feb 2008 14:37:17 -0000 1.5.2.2
@@ -17,7 +17,7 @@
/**
* @author Michiel Meeuwissen
* @since MMBase-1.7
- * @version $Id: AbstractTreeReferrerListTag.java,v 1.5.2.1 2008/02/14
14:21:47 michiel Exp $
+ * @version $Id: AbstractTreeReferrerListTag.java,v 1.5.2.2 2008/02/14
14:37:17 michiel Exp $
*/
abstract class AbstractTreeReferrerListTag extends TreeReferrerTag implements
ListProvider, DepthProvider {
@@ -68,6 +68,7 @@
collector = null;
tree = null;
pageContext.setAttribute(DepthProvider.KEY, prevDepthProvider,
PageContext.REQUEST_SCOPE);
+ prevDepthProvider = null;
return super.doEndTag();
}
public javax.servlet.jsp.jstl.core.LoopTagStatus getLoopStatus() {
Index: OnShrinkTag.java
===================================================================
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/tree/OnShrinkTag.java,v
retrieving revision 1.2.4.1
retrieving revision 1.2.4.2
diff -u -b -r1.2.4.1 -r1.2.4.2
--- OnShrinkTag.java 14 Feb 2008 14:21:47 -0000 1.2.4.1
+++ OnShrinkTag.java 14 Feb 2008 14:37:17 -0000 1.2.4.2
@@ -16,7 +16,7 @@
/**
* @author Michiel Meeuwissen
* @since MMBase-1.7
- * @version $Id: OnShrinkTag.java,v 1.2.4.1 2008/02/14 14:21:47 michiel Exp $
+ * @version $Id: OnShrinkTag.java,v 1.2.4.2 2008/02/14 14:37:17 michiel Exp $
*/
public class OnShrinkTag extends TreeReferrerTag implements DepthProvider {
private static final Logger log =
Logging.getLoggerInstance(OnShrinkTag.class);
@@ -49,6 +49,7 @@
public int doEndTag() throws JspTagException {
pageContext.setAttribute(DepthProvider.KEY, prevDepthProvider,
PageContext.REQUEST_SCOPE);
+ prevDepthProvider = null;
return super.doEndTag();
}
Index: TreeReferrerTag.java
===================================================================
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/tree/TreeReferrerTag.java,v
retrieving revision 1.2.4.1
retrieving revision 1.2.4.2
diff -u -b -r1.2.4.1 -r1.2.4.2
--- TreeReferrerTag.java 14 Feb 2008 14:21:47 -0000 1.2.4.1
+++ TreeReferrerTag.java 14 Feb 2008 14:37:17 -0000 1.2.4.2
@@ -9,8 +9,6 @@
*/
package org.mmbase.bridge.jsp.taglib.tree;
-
-
import javax.servlet.jsp.JspTagException;
import javax.servlet.jsp.PageContext;
@@ -21,7 +19,7 @@
/**
* @author Michiel Meeuwissen
* @since MMBase-1.7
- * @version $Id: TreeReferrerTag.java,v 1.2.4.1 2008/02/14 14:21:47 michiel
Exp $
+ * @version $Id: TreeReferrerTag.java,v 1.2.4.2 2008/02/14 14:37:17 michiel
Exp $
*/
abstract public class TreeReferrerTag extends NodeReferrerTag {
Index: TreeTag.java
===================================================================
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/tree/TreeTag.java,v
retrieving revision 1.18.2.1
retrieving revision 1.18.2.2
diff -u -b -r1.18.2.1 -r1.18.2.2
--- TreeTag.java 14 Feb 2008 14:21:47 -0000 1.18.2.1
+++ TreeTag.java 14 Feb 2008 14:37:17 -0000 1.18.2.2
@@ -48,7 +48,7 @@
</pre>
* @author Michiel Meeuwissen
* @since MMBase-1.7
- * @version $Id: TreeTag.java,v 1.18.2.1 2008/02/14 14:21:47 michiel Exp $
+ * @version $Id: TreeTag.java,v 1.18.2.2 2008/02/14 14:37:17 michiel Exp $
*/
public class TreeTag extends AbstractNodeProviderTag implements TreeProvider,
QueryContainerReferrer {
private static final Logger log = Logging.getLoggerInstance(TreeTag.class);
@@ -338,6 +338,8 @@
shrinkStack = null;
nextNode = null;
collector = null;
+ prevDepthProvider = null;
+ prevTreeProvider = null;
return super.doEndTag();
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
