summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraclement <aclement>2006-05-11 10:45:18 +0000
committeraclement <aclement>2006-05-11 10:45:18 +0000
commit9d1f31f65bbf7e7d4b5e205d983201d724f97676 (patch)
tree5912ab7cefb66d54e44219c13485ba419349bd29
parent60033cf18f34c7eab52eaa0638876fbb1ee55911 (diff)
downloadaspectj-9d1f31f65bbf7e7d4b5e205d983201d724f97676.tar.gz
aspectj-9d1f31f65bbf7e7d4b5e205d983201d724f97676.zip
fixes for missing error messages (pr132314)
-rw-r--r--org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/AjCompilerAdapter.java11
-rw-r--r--org.eclipse.jdt.core/jdtcore-for-aspectj-src.zipbin3710502 -> 3710501 bytes
-rw-r--r--org.eclipse.jdt.core/jdtcore-for-aspectj.jarbin5494331 -> 5494403 bytes
3 files changed, 10 insertions, 1 deletions
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/AjCompilerAdapter.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/AjCompilerAdapter.java
index 0c17b031c..371924361 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/AjCompilerAdapter.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/AjCompilerAdapter.java
@@ -176,6 +176,15 @@ public class AjCompilerAdapter implements ICompilerAdapter {
public void afterCompiling(CompilationUnitDeclaration[] units) {
this.eWorld.cleanup();
try {
+ // not great ... but one more check before we continue, see pr132314
+ if (!reportedErrors && units!=null) {
+ for (int i = 0; i < units.length; i++) {
+ if (units[i]!=null && units[i].compilationResult!=null && units[i].compilationResult.hasErrors()) {
+ reportedErrors = true;
+ break;
+ }
+ }
+ }
if (isXTerminateAfterCompilation || (reportedErrors && !proceedOnError)) {
// no point weaving... just tell the requestor we're done
notifyRequestor();
@@ -320,4 +329,4 @@ public class AjCompilerAdapter implements ICompilerAdapter {
}
}
-}
+} \ No newline at end of file
diff --git a/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip b/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip
index 216620eab..ece3cbf65 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 6cf9ed3b4..26d5499ea 100644
--- a/org.eclipse.jdt.core/jdtcore-for-aspectj.jar
+++ b/org.eclipse.jdt.core/jdtcore-for-aspectj.jar
Binary files differ