diff --git a/WHATSNEW b/WHATSNEW index 6ec6b1ece..7eb1b949c 100644 --- a/WHATSNEW +++ b/WHATSNEW @@ -68,6 +68,9 @@ Fixed bugs: target if "ant -p" failed. Bugzilla Report 48980 + * 's sourcebase attribute was broken. + Bugzilla Report 48970 + Other changes: -------------- diff --git a/src/main/org/apache/tools/ant/taskdefs/Rmic.java b/src/main/org/apache/tools/ant/taskdefs/Rmic.java index 6dc23bc43..13a6d3bf1 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Rmic.java +++ b/src/main/org/apache/tools/ant/taskdefs/Rmic.java @@ -705,7 +705,8 @@ public class Rmic extends MatchingTask { continue; } String sourceFileName = StringUtils.removeSuffix(generatedFile, - ".class"); + ".class") + + ".java"; File oldFile = new File(baseDir, sourceFileName); if (!oldFile.exists()) { diff --git a/src/tests/antunit/taskdefs/rmic-test.xml b/src/tests/antunit/taskdefs/rmic-test.xml index 65688de7e..e2b2f3a41 100644 --- a/src/tests/antunit/taskdefs/rmic-test.xml +++ b/src/tests/antunit/taskdefs/rmic-test.xml @@ -76,4 +76,31 @@ public class Adapter implements RmicAdapter { + + + + + + + + + + + + +