Repository: ant Updated Branches: refs/heads/master 61811c2bc -> f45474c20
createAndSet never returns null based on pytch by Kui Liu Project: http://git-wip-us.apache.org/repos/asf/ant/repo Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/99a7f591 Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/99a7f591 Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/99a7f591 Branch: refs/heads/master Commit: 99a7f5916b38113f7e80997cd6b576c624b6efcd Parents: 013e915 Author: Stefan Bodewig <[email protected]> Authored: Sun Oct 15 07:24:15 2017 +0200 Committer: Stefan Bodewig <[email protected]> Committed: Sun Oct 15 07:24:15 2017 +0200 ---------------------------------------------------------------------- .../org/apache/tools/ant/AntTypeDefinition.java | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant/blob/99a7f591/src/main/org/apache/tools/ant/AntTypeDefinition.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/tools/ant/AntTypeDefinition.java b/src/main/org/apache/tools/ant/AntTypeDefinition.java index 104820f..c7b223c 100644 --- a/src/main/org/apache/tools/ant/AntTypeDefinition.java +++ b/src/main/org/apache/tools/ant/AntTypeDefinition.java @@ -217,19 +217,12 @@ public class AntTypeDefinition { return null; } Object o = createAndSet(project, c); - if (o == null || adapterClass == null) { + if (adapterClass == null + || (adaptToClass != null && adaptToClass.isAssignableFrom(o.getClass()))) { return o; } - if (adaptToClass != null) { - if (adaptToClass.isAssignableFrom(o.getClass())) { - return o; - } - } TypeAdapter adapterObject = (TypeAdapter) createAndSet( project, adapterClass); - if (adapterObject == null) { - return null; - } adapterObject.setProxy(o); return adapterObject; } @@ -257,9 +250,6 @@ public class AntTypeDefinition { || !adaptToClass.isAssignableFrom(clazz))) { TypeAdapter adapter = (TypeAdapter) createAndSet( project, adapterClass); - if (adapter == null) { - throw new BuildException("Unable to create adapter object"); - } adapter.checkProxyClass(clazz); } } @@ -267,12 +257,11 @@ public class AntTypeDefinition { /** * Get the constructor of the definition * and invoke it. - * @return the instantiated <code>Object</code>. + * @return the instantiated <code>Object</code>, will never be null. */ private Object createAndSet(Project project, Class<?> c) { try { - Object o = innerCreateAndSet(c, project); - return o; + return innerCreateAndSet(c, project); } catch (InvocationTargetException ex) { Throwable t = ex.getTargetException(); throw new BuildException(
