From 92b63d872fc80095fd18081630a915e88b1d1aea Mon Sep 17 00:00:00 2001
From: Antoine Levy-Lambert <antoine@apache.org>
Date: Thu, 9 Nov 2006 03:45:48 +0000
Subject: [PATCH] Incorrect recursion in DOMUtil.listChildNodes() Bugzilla
 40918.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@472761 13f79535-47bb-0310-9956-ffa450edef68
---
 WHATSNEW                                      |  3 ++
 .../taskdefs/optional/junit/matches.xml       |  8 +++
 .../ant/taskdefs/optional/junit/DOMUtil.java  |  2 +-
 .../taskdefs/optional/junit/DOMUtilTest.java  | 49 +++++++++++++++++++
 4 files changed, 61 insertions(+), 1 deletion(-)
 create mode 100644 src/etc/testcases/taskdefs/optional/junit/matches.xml
 create mode 100644 src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/DOMUtilTest.java

diff --git a/WHATSNEW b/WHATSNEW
index 030edd77a..66f1450fe 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -10,6 +10,9 @@ Fixed bugs:
 * docletpath attribute of javadoc ignored.
   Bugzilla 40900.
 
+* Incorrect recursion in DOMUtil.listChildNodes()
+  Bugzilla 40918.
+
 Other changes:
 --------------
 
diff --git a/src/etc/testcases/taskdefs/optional/junit/matches.xml b/src/etc/testcases/taskdefs/optional/junit/matches.xml
new file mode 100644
index 000000000..0ca9818ae
--- /dev/null
+++ b/src/etc/testcases/taskdefs/optional/junit/matches.xml
@@ -0,0 +1,8 @@
+<matches>
+  <foo>
+    <abc>
+      <foo/>
+      <foo/>
+    </abc>
+  </foo>
+</matches>
\ No newline at end of file
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/DOMUtil.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/DOMUtil.java
index bab52c86f..762432027 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/DOMUtil.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/DOMUtil.java
@@ -73,7 +73,7 @@ public final class DOMUtil {
                 }
                 if (recurse) {
                     NodeList recmatches = listChildNodes(child, filter, recurse);
-                    final int reclength = matches.getLength();
+                    final int reclength = recmatches.getLength();
                     for (int j = 0; j < reclength; j++) {
                         matches.addElement(recmatches.item(i));
                     }
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/DOMUtilTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/DOMUtilTest.java
new file mode 100644
index 000000000..3fc971a10
--- /dev/null
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/DOMUtilTest.java
@@ -0,0 +1,49 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+package org.apache.tools.ant.taskdefs.optional.junit;
+
+import junit.framework.TestCase;
+
+import javax.xml.parsers.DocumentBuilder;
+
+import org.apache.tools.ant.util.JAXPUtils;
+import org.w3c.dom.Document;
+import org.w3c.dom.NodeList;
+import org.w3c.dom.Node;
+import org.xml.sax.SAXException;
+
+import java.io.InputStream;
+import java.io.IOException;
+
+public class DOMUtilTest extends TestCase {
+    public void testListChildNodes() throws SAXException, IOException {
+        DocumentBuilder db = JAXPUtils.getDocumentBuilder();
+        InputStream is = this.getClass().getClassLoader().getResourceAsStream("taskdefs/optional/junit/matches.xml");
+        Document doc = db.parse(is);
+        NodeList nl = DOMUtil.listChildNodes(doc.getFirstChild(), new FooNodeFilter(), true);
+        assertEquals(nl.getLength(), 3);
+    }
+    public class FooNodeFilter implements DOMUtil.NodeFilter {
+        public boolean accept(Node node) {
+            if (node.getNodeName().equals("foo")) {
+                return true;
+            }
+            return false;  //To change body of implemented methods use File | Settings | File Templates.
+        }
+    }
+}