From 0e37f4714ce94dd13aaae444988b88d6bf5233c7 Mon Sep 17 00:00:00 2001 From: Conor MacNeill Date: Thu, 2 Aug 2001 12:53:51 +0000 Subject: [PATCH] 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 --- .../taskdefs/optional/ejb/GenericDeploymentTool.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java index 80c143c3e..c052d1fa8 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java @@ -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);