craigmcc 01/04/15 15:02:27
Modified: src/share/org/apache/struts/digester Digester.java
Log:
Rearrange initialization and finalization so that the root element is actually
returned from the parse() method.
PR: Bugzilla #1135
Submitted by: Yuhong Guo <[EMAIL PROTECTED]>
Revision Changes Path
1.18 +6 -7
jakarta-struts/src/share/org/apache/struts/digester/Digester.java
Index: Digester.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/digester/Digester.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Digester.java 2001/04/14 02:11:02 1.17
+++ Digester.java 2001/04/15 22:02:27 1.18
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/digester/Digester.java,v 1.17
2001/04/14 02:11:02 craigmcc Exp $
- * $Revision: 1.17 $
- * $Date: 2001/04/14 02:11:02 $
+ * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/digester/Digester.java,v 1.18
2001/04/15 22:02:27 craigmcc Exp $
+ * $Revision: 1.18 $
+ * $Date: 2001/04/15 22:02:27 $
*
* ====================================================================
*
@@ -102,7 +102,7 @@
* even from the same thread.</p>
*
* @author Craig McClanahan
- * @version $Revision: 1.17 $ $Date: 2001/04/14 02:11:02 $
+ * @version $Revision: 1.18 $ $Date: 2001/04/15 22:02:27 $
*/
public class Digester extends HandlerBase {
@@ -1005,7 +1005,6 @@
match = "";
bodyTexts.clear();
stack.clear();
- root = null;
}
@@ -1051,8 +1050,6 @@
public Object pop() {
try {
- if (stack.size() == 1)
- root = stack.peek();
return (stack.pop());
} catch (EmptyStackException e) {
return (null);
@@ -1068,6 +1065,8 @@
*/
public void push(Object object) {
+ if (stack.size() == 0)
+ root = object;
stack.push(object);
}
