References not passed by antcall

PR: 21724


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274884 13f79535-47bb-0310-9956-ffa450edef68

WHATSNEW

@@ -210,6 +210,8 @@ Fixed bugs:
 * Prevent sysproperties with no key or no value from being added in <junit>.
   Bugzilla Report 21684.
 
+* Allow references to be properly inherited via antcall
+  Bugzilla Report 21724.
 
 Other changes:
 --------------

src/etc/testcases/taskdefs/calltarget.xml

@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<project name ="calltarget-test" default="testinheritreffileset" basedir=".">
+    <property name="tmp.dir" value="tmp.dir" />
+    <target name="setup">
+        <mkdir dir="${tmp.dir}"/>
+    </target>
+    <target name="cleanup">
+        <delete dir="${tmp.dir}" quiet="true"/>
+    </target>
+    <target name="mytarget">
+      <pathconvert property="myproperty" targetos="unix" refid="myfileset"/>
+      <echo message="myproperty=${myproperty}"/>
+    </target>
+    <target name="testinheritreffileset">
+    <!-- this testcase should show that the fileset defined here
+    can be read in the called target -->
+      <fileset dir="." id="myfileset">
+        <include name="calltarget.xml"/>
+      </fileset>
+      <antcall target="mytarget" inheritrefs="true"/>
+    </target>
+    <target name="copytest2">
+       <copy file="${tmp.dir}/copytest.in" toFile="${tmp.dir}/copytest1.out" overwrite="true">
+          <filterset refid="foo"/>
+       </copy>
+    </target>
+    <target name="testinheritreffilterset" depends="setup">
+       <echo file="${tmp.dir}/copytest.in">@@foo@@</echo>
+       <filterset id="foo" begintoken="@@" endtoken="@@">
+          <filter token="foo" value="bar"/>
+       </filterset>
+       <antcall target="copytest2" inheritrefs="true"/>
+       <copy file="${tmp.dir}/copytest.in" toFile="${tmp.dir}/copytest2.out" overwrite="true">
+          <filterset refid="foo"/>
+       </copy>
+       <loadfile srcFile="${tmp.dir}/copytest2.out" property="copytest2"/>
+       <loadfile srcFile="${tmp.dir}/copytest1.out" property="copytest1"/>
+       <condition property="success">
+           <equals arg1="${copytest1}" arg2="${copytest2}"/>
+       </condition>
+       <fail message="filterset not properly passed across by antcall" unless="success"/>
+    </target>
+
+
+</project>

src/main/org/apache/tools/ant/Project.java

@@ -2063,8 +2063,9 @@ public class Project {
             Object o = super.get(key);
             if (o instanceof UnknownElement) {
                 // Make sure that
-                ((UnknownElement) o).maybeConfigure();
-                o = ((UnknownElement) o).getTask();
+                UnknownElement ue = (UnknownElement) o;
+                ue.maybeConfigure();
+                o = ue.getRealThing();
             }
             return o;
         }

src/main/org/apache/tools/ant/UnknownElement.java

@@ -457,6 +457,16 @@ public class UnknownElement extends Task {
         return null;
     }
 
+    /**
+     * Return the configured object
+     *
+     * @return the real thing whatever it is
+     *
+     * @since ant 1.6
+     */
+    public Object getRealThing() {
+        return realThing;
+    }
     /**
      * Try to create a nested element of <code>parent</code> for the
      * given tag.

src/testcases/org/apache/tools/ant/taskdefs/CallTargetTest.java

@@ -0,0 +1,87 @@
+/*
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2003 The Apache Software Foundation.  All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ *    any, must include the following acknowlegement:
+ *       "This product includes software developed by the
+ *        Apache Software Foundation (http://www.apache.org/)."
+ *    Alternately, this acknowlegement may appear in the software itself,
+ *    if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The names "Ant" and "Apache Software
+ *    Foundation" must not be used to endorse or promote products derived
+ *    from this software without prior written permission. For written
+ *    permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ *    nor may "Apache" appear in their names without prior written
+ *    permission of the Apache Group.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ */
+
+package org.apache.tools.ant.taskdefs;
+
+import org.apache.tools.ant.BuildFileTest;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.util.JavaEnvUtils;
+
+/**
+ * @author Nico Seessle <nico@seessle.de>
+ */
+public class CallTargetTest extends BuildFileTest {
+
+    public CallTargetTest(String name) {
+        super(name);
+    }
+
+    public void setUp() {
+        configureProject("src/etc/testcases/taskdefs/calltarget.xml");
+    }
+
+    // see bugrep 21724 (references not passing through with antcall)
+    public void testInheritRefFileSet() {
+        expectLogContaining("testinheritreffileset", "calltarget.xml");
+    }
+
+    // see bugrep 21724 (references not passing through with antcall)
+    public void testInheritFilterset() {
+        project.executeTarget("testinheritfilterset");
+    }
+
+    public void tearDown() {
+        project.executeTarget("cleanup");
+    }
+}