From c82f7ed3fc1872e6b138e816362a0331641b8be6 Mon Sep 17 00:00:00 2001
From: moparisthebest <admin@moparisthebest.com>
Date: Mon, 13 Oct 2014 11:31:53 -0400
Subject: [PATCH] Proper fix for Anchor and TreeLabel to clear state after the
 current tag is finished

---
 .../java/org/apache/beehive/netui/tags/html/Anchor.java   | 8 ++++++--
 .../org/apache/beehive/netui/tags/tree/TreeLabel.java     | 7 +++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/beehive-netui-tags/src/main/java/org/apache/beehive/netui/tags/html/Anchor.java b/beehive-netui-tags/src/main/java/org/apache/beehive/netui/tags/html/Anchor.java
index c2d7386..89e2fb3 100644
--- a/beehive-netui-tags/src/main/java/org/apache/beehive/netui/tags/html/Anchor.java
+++ b/beehive-netui-tags/src/main/java/org/apache/beehive/netui/tags/html/Anchor.java
@@ -325,8 +325,6 @@ public class Anchor extends AnchorBase
             bodyContent.clearBody();
             if (value.length() > 0)
                 _text = value;
-            else
-                _text = null;
         }
         return SKIP_BODY;
     }
@@ -372,4 +370,10 @@ public class Anchor extends AnchorBase
         return EVAL_PAGE;
     }
 
+    @Override
+    protected void localRelease() {
+        super.localRelease();
+        _text = null;
+        _value = null;
+    }
 }
diff --git a/beehive-netui-tags/src/main/java/org/apache/beehive/netui/tags/tree/TreeLabel.java b/beehive-netui-tags/src/main/java/org/apache/beehive/netui/tags/tree/TreeLabel.java
index 5fa8142..34061c5 100644
--- a/beehive-netui-tags/src/main/java/org/apache/beehive/netui/tags/tree/TreeLabel.java
+++ b/beehive-netui-tags/src/main/java/org/apache/beehive/netui/tags/tree/TreeLabel.java
@@ -36,8 +36,6 @@ public class TreeLabel extends AbstractSimpleTag
 {
     private static final Logger logger = Logger.getInstance(TreeLabel.class);
 
-    private String _text;
-
     /**
      * Return the name of the Tag.
      */
@@ -54,8 +52,9 @@ public class TreeLabel extends AbstractSimpleTag
             throws JspException, IOException
     {
         String value = getBufferBody(true);
+        String text = "";
         if (value.length() > 0)
-            _text = value;
+            text = value;
 
         Object o = getParent();
         assert (o != null);
@@ -66,6 +65,6 @@ public class TreeLabel extends AbstractSimpleTag
 
         // assign the value to the parent's label value
         TreeItem ti = (TreeItem) o;
-        ti.setItemLabel(_text);
+        ti.setItemLabel(text);
     }
 }