Author: mbenson
Date: Thu Sep 14 10:18:52 2006
New Revision: 443420

URL: http://svn.apache.org/viewvc?view=rev&rev=443420
Log:
don't bother to check for circular references if you're just going to die 
anyway due to null Project

Modified:
    ant/core/trunk/src/main/org/apache/tools/ant/types/DataType.java

Modified: ant/core/trunk/src/main/org/apache/tools/ant/types/DataType.java
URL: 
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/types/DataType.java?view=diff&rev=443420&r1=443419&r2=443420
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/types/DataType.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/types/DataType.java Thu Sep 14 
10:18:52 2006
@@ -253,10 +253,10 @@
      */
     protected Object getCheckedRef(final Class requiredClass,
                                    final String dataTypeName, final Project 
project) {
-        dieOnCircularReference(project);
         if (project == null) {
             throw new BuildException("No Project specified");
         }
+        dieOnCircularReference(project);
         Object o = ref.getReferencedObject(project);
         if (!(requiredClass.isAssignableFrom(o.getClass()))) {
             log("Class " + o.getClass() + " is not a subclass of " + 
requiredClass,



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

Reply via email to