webwork/src/main/webwork/view/taglib PropertyTag.java,1.5.2.1,1.5.2.2 BeanTag.java,1.2,1.2.2.1

Update of /cvsroot/webwork/webwork/src/main/webwork/view/taglib
In directory usw-pr-cvs1:/tmp/cvs-serv28607

Modified Files:
      Tag: branch-release-1-0-3
	PropertyTag.java BeanTag.java 
Log Message:
moving latest from HEAD to branch

Index: PropertyTag.java
===================================================================
RCS file: /cvsroot/webwork/webwork/src/main/webwork/view/taglib/PropertyTag.java,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -d -r1.5.2.1 -r1.5.2.2
--- PropertyTag.java	21 May 2002 03:27:18 -0000	1.5.2.1
+++ PropertyTag.java	23 May 2002 13:52:05 -0000	1.5.2.2
@@ -65,7 +65,12 @@
       // This is a workaround for a bug in Jasper.
       // http://znutar.cortexity.com/BugRatViewer/ShowReport/652
       // Resin 1.2.1 also has this bug (i.e. body is called even though it is empty)
-      String body = getBodyContent().getString();
+      String body = null;
+      try {
+         body = getBodyContent().getString();
+      } catch (Exception e) {
+         body = new String("");
+      }
       hadBody = body.length() != 0;
       //by default, we do not want to escape the body
       if (escape == null) {

Index: BeanTag.java
===================================================================
RCS file: /cvsroot/webwork/webwork/src/main/webwork/view/taglib/BeanTag.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- BeanTag.java	8 May 2002 20:38:38 -0000	1.2
+++ BeanTag.java	23 May 2002 13:52:05 -0000	1.2.2.1
@@ -12,6 +12,8 @@
 import javax.servlet.jsp.PageContext;
 import java.beans.Beans;
 
+import org.apache.log4j.Category;
+
 /**
  *	Instantiate a JavaBean.
  *
@@ -86,8 +88,15 @@
    public int doEndTag() throws JspException
    {
       getStack().popValue();
-      bean = null;
-      nameAttr = null;
+      //bean = null;
+      //nameAttr = null;
       return EVAL_PAGE;
+   }
+
+   public void release()
+   {
+      bean=null;
+      nameAttr=null;
+      super.release();
    }
 }



_______________________________________________________________

Don't miss the 2002 Sprint PCS Application Developer's Conference
August 25-28 in Las Vegas -- http://devcon.sprintpcs.com/adp/index.cfm