Re: [digester] patch to keep stack of matched rules [also: Mixed Content support]

[Craig McClanahan]

Simon Kitching wrote:

Hi,

Here's a simple patch that I think would make digester more efficient,
by avoiding unnecessary calls to rules.getMatch().
It also happens to make it easier to implement my proposed solution for
the "mixed content" issue currently being discussed.
The Digester with this patch applied passes all existing unit tests, of
course.
Any comments/opinions?

 

I like the idea in general, but would ask one favor ... could you try 
the modified code with Tomcat and/or Struts as well?  I don't think our 
unit tests cover some of the interdependencies -- not that this patch 
looks like it would break anything, but I just like to make sure we're 
not messing up two primary customer projects.

I also promise to look at the mixed content stuff when I can ... 
unfortunately, that is looking like no earlier than Saturday :-(.

Regards,

Simon
 

 

Craig

------------------------------------------------------------------------

Index: Digester.java
===================================================================
RCS file: 
/home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/Digester.java,v
retrieving revision 1.98
diff -u -r1.98 Digester.java
--- Digester.java       29 Mar 2004 20:34:54 -0000      1.98
+++ Digester.java       1 Apr 2004 03:45:32 -0000
@@ -141,6 +141,16 @@
    /**
+     * Stack whose elements are List objects, each containing a list of
+     * Rule objects as returned from Rules.getMatch(). As each xml element
+     * in the input is entered, the matching rules are pushed onto this
+     * stack. After the end tag is reached, the matches are popped again.
+     * The depth of is stack is therefore exactly the same as the current
+     * "nesting" level of the input xml. 
+     */
+    protected ArrayStack matches = new ArrayStack(10);
+    
+    /**
     * The class loader to use for instantiating application objects.
     * If not specified, the context class loader, or the class loader
     * used to load Digester itself, is used, based on the value of the
@@ -1006,7 +1016,7 @@
        }

        // Fire "body" events for all relevant rules
-        List rules = getRules().match(namespaceURI, match);
+        List rules = (List) matches.pop();
        if ((rules != null) && (rules.size() > 0)) {
            String bodyText = this.bodyText.toString();
            Substitutor substitutor = getSubstitutor();
@@ -1256,6 +1266,7 @@
        // Fire "begin" events for all relevant rules
        List rules = getRules().match(namespaceURI, match);
+        matches.push(rules);
        if ((rules != null) && (rules.size() > 0)) {
            Substitutor substitutor = getSubstitutor();
            if (substitutor!= null) {
 

------------------------------------------------------------------------

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]


---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]