first step of reference-check auditing after I re-understood how things are supposed to work.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@721523 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 23 insertions, 0 deletions

diff --git a/src/main/org/apache/tools/ant/types/XMLCatalog.java b/src/main/org/apache/tools/ant/types/XMLCatalog.java
index 66413e519..739dac134 100644
--- a/src/main/org/apache/tools/ant/types/XMLCatalog.java
+++ b/src/main/org/apache/tools/ant/types/XMLCatalog.java
@@ -27,6 +27,7 @@ import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Enumeration;
+import java.util.Stack;
 import java.util.Vector;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParserFactory;
@@ -451,6 +452,28 @@ public class XMLCatalog extends DataType
         return source;
     }
 
+    protected synchronized void dieOnCircularReference(Stack stk, Project p)
+        throws BuildException {
+        if (isChecked()) {
+            return;
+        }
+        if (isReference()) {
+            super.dieOnCircularReference(stk, p);
+        } else {
+            if (classpath != null) {
+                stk.push(classpath);
+                invokeCircularReferenceCheck(classpath, stk, p);
+                stk.pop();
+            }
+            if (catalogPath != null) {
+                stk.push(catalogPath);
+                invokeCircularReferenceCheck(catalogPath, stk, p);
+                stk.pop();
+            }
+            setChecked(true);
+        }
+    }
+
     /**
      * @since Ant 1.6
      */