Repository: ant Updated Branches: refs/heads/master 13b0df1f0 -> 963d6c9a0
PR 56830 classloader hint when assigning refs fails Project: http://git-wip-us.apache.org/repos/asf/ant/repo Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/963d6c9a Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/963d6c9a Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/963d6c9a Branch: refs/heads/master Commit: 963d6c9a0af09690d6b37eb80175887961e7e1d6 Parents: 13b0df1 Author: Stefan Bodewig <[email protected]> Authored: Sun Sep 21 13:41:33 2014 +0200 Committer: Stefan Bodewig <[email protected]> Committed: Sun Sep 21 13:41:33 2014 +0200 ---------------------------------------------------------------------- src/main/org/apache/tools/ant/types/DataType.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant/blob/963d6c9a/src/main/org/apache/tools/ant/types/DataType.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/tools/ant/types/DataType.java b/src/main/org/apache/tools/ant/types/DataType.java index 577e69e..fda4af6 100644 --- a/src/main/org/apache/tools/ant/types/DataType.java +++ b/src/main/org/apache/tools/ant/types/DataType.java @@ -241,14 +241,16 @@ public abstract class DataType extends ProjectComponent implements Cloneable { * @since Ant 1.7 */ protected <T> T getCheckedRef(final Class<T> requiredClass, - final String dataTypeName, final Project project) { + final String dataTypeName, final Project 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, + log("Class " + displayName(o.getClass()) + + " is not a subclass of " + + displayName(requiredClass), Project.MSG_VERBOSE); String msg = ref.getRefId() + " doesn\'t denote a " + dataTypeName; throw new BuildException(msg); @@ -357,5 +359,9 @@ public abstract class DataType extends ProjectComponent implements Cloneable { dt.setChecked(isChecked()); return dt; } + + private String displayName(Class<?> clazz) { + return clazz.getName() + " (loaded via " + clazz.getClassLoader() +")"; + } }
