Browse Source

Handle innser classes in the default package

PR:	2934


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@269440 13f79535-47bb-0310-9956-ffa450edef68
master
Conor MacNeill 24 years ago
parent
commit
0e37f4714c
1 changed files with 8 additions and 3 deletions
  1. +8
    -3
      src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java

+ 8
- 3
src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java View File

@@ -693,11 +693,16 @@ public class GenericDeploymentTool implements EJBDeploymentTool {
InnerClassFilenameFilter flt = new InnerClassFilenameFilter(entryFile.getName());
File entryDir = entryFile.getParentFile();
String[] innerfiles = entryDir.list(flt);
for (int i=0, n=innerfiles.length; i < n; i++) {
for (int i = 0, n = innerfiles.length; i < n; i++) {
//get and clean up innerclass name
entryName = entryName.substring(0, entryName.lastIndexOf(entryFile.getName())-1) + File.separatorChar + innerfiles[i];
int entryIndex = entryName.lastIndexOf(entryFile.getName()) -1;
if ( entryIndex < 0) {
entryName = innerfiles[i];
}
else {
entryName = entryName.substring(0, entryIndex) + File.separatorChar + innerfiles[i];
}
// link the file
entryFile = new File(config.srcDir, entryName);


Loading…
Cancel
Save