From 6672d9d6c7aebc2ff4ccde1cd6d763b28e7f5d40 Mon Sep 17 00:00:00 2001
From: "Jesse N. Glick" <jglick@apache.org>
Date: Sat, 30 Dec 2006 01:44:10 +0000
Subject: [PATCH] #41264: In Ant 1.7.0, <fileset> in <javadoc> does not by
 default include only **/*.java as the documentation claims and earlier
 revisions did.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@491150 13f79535-47bb-0310-9956-ffa450edef68
---
 WHATSNEW                                             |  5 +++++
 src/etc/testcases/taskdefs/javadoc/javadoc.xml       | 12 ++++++++++++
 src/main/org/apache/tools/ant/taskdefs/Javadoc.java  |  7 ++++---
 .../org/apache/tools/ant/taskdefs/JavadocTest.java   |  5 +++++
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/WHATSNEW b/WHATSNEW
index a6c217b1b..4555b1dd3 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -6,6 +6,11 @@ Changes that could break older environments:
 
 Fixed bugs:
 -----------
+
+* In Ant 1.7.0, <fileset> in <javadoc> does not by default include only
+  **/*.java as the documentation claims and earlier revisions did.
+  Bugzilla report 41264.
+
 * SPI support in jar was broken.
   Bugzilla report 41201.
   
diff --git a/src/etc/testcases/taskdefs/javadoc/javadoc.xml b/src/etc/testcases/taskdefs/javadoc/javadoc.xml
index 74f43f7b1..e59133197 100755
--- a/src/etc/testcases/taskdefs/javadoc/javadoc.xml
+++ b/src/etc/testcases/taskdefs/javadoc/javadoc.xml
@@ -139,4 +139,16 @@
       <fileset refid="fileset.simple" />
     </javadoc>
   </target>
+
+  <target name="nonJavaIncludes">
+    <delete dir="${javadoc}"/>
+    <mkdir dir="${javadoc}"/>
+    <echo file="${javadoc}/stuff1.java">public class stuff1 {}</echo>
+    <echo file="${javadoc}/stuff2.java">public class stuff2 {}</echo>
+    <echo file="${javadoc}/stuff.properties">x=4</echo>
+    <javadoc destdir="${javadoc}" failonerror="true">
+      <fileset dir="${javadoc}"/>
+    </javadoc>
+  </target>
+
 </project>
diff --git a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
index b9247c99d..6e2d61cf8 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
@@ -2199,11 +2199,12 @@ public class Javadoc extends Task {
             if (rc instanceof FileSet) {
                 FileSet fs = (FileSet) rc;
                 if (!fs.hasPatterns() && !fs.hasSelectors()) {
-                    fs = (FileSet) fs.clone();
-                    fs.createInclude().setName("**/*.java");
+                    FileSet fs2 = (FileSet) fs.clone();
+                    fs2.createInclude().setName("**/*.java");
                     if (includeNoSourcePackages) {
-                        fs.createInclude().setName("**/package.html");
+                        fs2.createInclude().setName("**/package.html");
                     }
+                    rc = fs2;
                 }
             }
             Iterator iter = rc.iterator();
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/JavadocTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/JavadocTest.java
index f27f80b5e..e23386035 100755
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/JavadocTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/JavadocTest.java
@@ -131,4 +131,9 @@ public class JavadocTest extends BuildFileTest {
     public void testDoublyNestedFilesetNoPatterns() throws Exception {
         executeTarget("doublyNestedFilesetNoPatterns");
     }
+
+    public void testNonJavaIncludes() throws Exception { // #41264
+        executeTarget("nonJavaIncludes");
+    }
+
 }