fixes for 137235 (contributed by Ron): more intelligent logic for determining if a path entry is a jar/zip (don't just rely on suffix, some new .bndl files seem to be becoming popular...)

1 files changed, 2 insertions, 6 deletions

diff --git a/taskdefs/src/org/aspectj/tools/ant/taskdefs/AjcTask.java b/taskdefs/src/org/aspectj/tools/ant/taskdefs/AjcTask.java
index 86434732f..19b440f55 100644
--- a/taskdefs/src/org/aspectj/tools/ant/taskdefs/AjcTask.java
+++ b/taskdefs/src/org/aspectj/tools/ant/taskdefs/AjcTask.java
@@ -1106,12 +1106,8 @@ public class AjcTask extends MatchingTask {
                     || (null != inpathDirCopyFilter)) {
                 String path = outjar.getAbsolutePath();
                 int len = FileUtil.zipSuffixLength(path);
-                if (len < 1) {
-                    this.logger.info("not copying resources - weird outjar: " + path);
-                } else {
-                    path = path.substring(0, path.length()-len) + ".tmp.jar";
-                    tmpOutjar = new File(path);
-                }
+                path = path.substring(0, path.length()-len) + ".tmp.jar";
+                tmpOutjar = new File(path);
             }
             if (null == tmpOutjar) {                
                 cmd.addFlagged("-outjar", outjar.getAbsolutePath());