From c2f05281ce57b971efb89d3d8174373e66bbda6e Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Tue, 19 Feb 2002 13:09:13 +0000 Subject: [PATCH] Ignore redefinition of datatypes if new and old class are the same. PR: 6514 Submitted by: Peter Kristensen git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@271425 13f79535-47bb-0310-9956-ffa450edef68 --- src/main/org/apache/tools/ant/Project.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/main/org/apache/tools/ant/Project.java b/src/main/org/apache/tools/ant/Project.java index 15113bc62..79af9c350 100644 --- a/src/main/org/apache/tools/ant/Project.java +++ b/src/main/org/apache/tools/ant/Project.java @@ -659,9 +659,17 @@ public class Project { * @param typeClass full datatype classname */ public void addDataTypeDefinition(String typeName, Class typeClass) { - if (null != dataClassDefinitions.get(typeName)) { - log("Trying to override old definition of datatype "+typeName, - MSG_WARN); + Class old = (Class)dataClassDefinitions.get(typeName); + if (null != old) { + if (old.equals(typeClass)) { + log("Ignoring override for datatype " + typeName + + ", it is already defined by the same class.", + MSG_VERBOSE); + return; + } else { + log("Trying to override old definition of datatype "+typeName, + MSG_WARN); + } } String msg = " +User datatype: " + typeName + " " + typeClass.getName();