aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraclement <aclement>2004-11-23 13:06:30 +0000
committeraclement <aclement>2004-11-23 13:06:30 +0000
commit639b61b6a7f5cd090137340c35c2f4ae355ad538 (patch)
tree68638a4904b462364ced0c4ca0e41849d454883d
parent837c97b0dd4854b8dbc0075c94b6226fa49f1803 (diff)
downloadaspectj-639b61b6a7f5cd090137340c35c2f4ae355ad538.tar.gz
aspectj-639b61b6a7f5cd090137340c35c2f4ae355ad538.zip
Final !! fixes for Bug 78954: Compiler cannot cope with 4000 jars on the classpath
- Includes the modified JDT classes.
-rw-r--r--org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java1
-rw-r--r--org.eclipse.jdt.core/jdtcore-for-aspectj-src.zipbin3666234 -> 3667323 bytes
-rw-r--r--org.eclipse.jdt.core/jdtcore-for-aspectj.jarbin4144361 -> 4145284 bytes
-rw-r--r--weaver/src/org/aspectj/weaver/bcel/ClassPathManager.java2
4 files changed, 2 insertions, 1 deletions
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java
index f8e6050d1..a08d1c0ef 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java
@@ -233,6 +233,7 @@ public class AjBuildManager implements IOutputClassFileNameProvider,IBinarySourc
closeOutputStream(buildConfig.getOutputJar());
}
ret = !handler.hasErrors();
+ bcelWorld.tidyUp();
// bug 59895, don't release reference to handler as may be needed by a nested call
//handler = null;
}
diff --git a/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip b/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip
index 88c26c129..cdd78e442 100644
--- a/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip
+++ b/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip
Binary files differ
diff --git a/org.eclipse.jdt.core/jdtcore-for-aspectj.jar b/org.eclipse.jdt.core/jdtcore-for-aspectj.jar
index 1fefa03ca..abf576699 100644
--- a/org.eclipse.jdt.core/jdtcore-for-aspectj.jar
+++ b/org.eclipse.jdt.core/jdtcore-for-aspectj.jar
Binary files differ
diff --git a/weaver/src/org/aspectj/weaver/bcel/ClassPathManager.java b/weaver/src/org/aspectj/weaver/bcel/ClassPathManager.java
index 04f44e07f..d19b6b58c 100644
--- a/weaver/src/org/aspectj/weaver/bcel/ClassPathManager.java
+++ b/weaver/src/org/aspectj/weaver/bcel/ClassPathManager.java
@@ -44,7 +44,7 @@ public class ClassPathManager {
private static final int MAXOPEN_DEFAULT = 1000;
static {
- String openzipsString = getSystemPropertyWithoutSecurityException("org.aspectj.weaver.openzips",Integer.toString(MAXOPEN_DEFAULT));
+ String openzipsString = getSystemPropertyWithoutSecurityException("org.aspectj.weaver.openarchives",Integer.toString(MAXOPEN_DEFAULT));
maxOpenArchives=Integer.parseInt(openzipsString);
if (maxOpenArchives<20) maxOpenArchives=1000;
}