Fix for Bugzilla Bug 57430

   exception printing

1 files changed, 8 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 8bb0a7c83..d8eb8fbdb 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
@@ -116,7 +116,14 @@ public class AjCompilerAdapter implements ICompilerAdapter {
 		} catch (IOException ex) {
 			AbortCompilation ac = new AbortCompilation(null,ex);
 			throw ac;
-		} 
+		} catch (RuntimeException rEx) {
+			if (rEx instanceof AbortCompilation) throw rEx; // Don't wrap AbortCompilation exceptions!
+
+			// This will be unwrapped in Compiler.handleInternalException() and the nested
+			// RuntimeException thrown back to the original caller - which is AspectJ
+			// which will then then log it as a compiler problem.
+			throw new AbortCompilation(true,rEx);
+		}
 	}
 
 	public void beforeProcessing(CompilationUnitDeclaration unit) {