bodewig 02/02/19 05:09:13
Modified: src/main/org/apache/tools/ant Project.java
Log:
Ignore redefinition of datatypes if new and old class are the same.
PR: 6514
Submitted by: Peter Kristensen <[EMAIL PROTECTED]>
Revision Changes Path
1.94 +11 -3 jakarta-ant/src/main/org/apache/tools/ant/Project.java
Index: Project.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/Project.java,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- Project.java 2 Feb 2002 12:52:00 -0000 1.93
+++ Project.java 19 Feb 2002 13:09:13 -0000 1.94
@@ -659,9 +659,17 @@
* @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();
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
