Merge fix from 1.5 branch.

PR: 5781 and 11630


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

src/main/org/apache/tools/ant/taskdefs/Rmic.java

@@ -564,15 +564,16 @@ public class Rmic extends MatchingTask {
             adapter.getMapper().mapFileName(classFileName);
 
         for (int i = 0; i < generatedFiles.length; i++) {
-            if (!generatedFiles[i].endsWith(".class")) {
+            final String generatedFile = generatedFiles[i];
+            if (!generatedFile.endsWith(".class")) {
                 // don't know how to handle that - a IDL file doesn't
                 // have a corresponding Java source for example.
                 continue;
             }
-            
-            String sourceFileName = 
-                generatedFiles[i].substring(0, classFileName.length() - 6)
-                + ".java";
+
+            final int pos = generatedFile.length() - ".class".length();
+            String sourceFileName =
+                generatedFile.substring(0, pos) + ".java";
 
             File oldFile = new File(baseDir, sourceFileName);
             if (!oldFile.exists()) {