diff options
Diffstat (limited to 'src/main/org/apache/tools/ant/taskdefs/MacroDef.java')
| -rw-r--r-- | src/main/org/apache/tools/ant/taskdefs/MacroDef.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/org/apache/tools/ant/taskdefs/MacroDef.java b/src/main/org/apache/tools/ant/taskdefs/MacroDef.java index d69907d0d..1892f6805 100644 --- a/src/main/org/apache/tools/ant/taskdefs/MacroDef.java +++ b/src/main/org/apache/tools/ant/taskdefs/MacroDef.java @@ -729,8 +729,8 @@ public class MacroDef extends AntlibDefinition { } if (getURI() == null || "".equals(getURI()) || getURI().equals(ProjectHelper.ANT_CORE_URI)) { - if (!(other.getURI() == null || "".equals(other.getURI()) - || other.getURI().equals(ProjectHelper.ANT_CORE_URI))) { + if (other.getURI() != null && !"".equals(other.getURI()) + && !other.getURI().equals(ProjectHelper.ANT_CORE_URI)) { return false; } } else if (!getURI().equals(other.getURI())) { |